Merge from Trunk

[SVN r49252]
This commit is contained in:
Joel de Guzman
2008-10-10 15:05:47 +00:00
parent a046e43990
commit d004046aa5
233 changed files with 1338 additions and 1278 deletions

View File

@ -1,8 +1,8 @@
/*=============================================================================
Copyright (c) 2005-2006 João Abecasis
Copyright (c) 2005-2006 Joao Abecasis
Copyright (c) 2006-2007 Tobias Schwinger
Use modification and distribution are subject to the Boost Software
Use modification and distribution are subject to the Boost Software
License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
http://www.boost.org/LICENSE_1_0.txt).
==============================================================================*/
@ -48,10 +48,10 @@ class members
{
public:
int data;
members()
: data(20)
{ }
{ }
int nullary() { return element1 = data + 1; }
int nullary_c() const { return element1 = data + 2; }