Subject: [Boost-commit] svn:boost r53141 - in trunk: boost/algorithm/string/detail boost/archive/impl boost/date_time boost/exception/detail boost/format boost/interprocess boost/interprocess/detail boost/intrusive boost/iostreams boost/iostreams/device boost/iostreams/filter boost/math/distributions/detail boost/math/special_functions boost/math/special_functions/detail boost/mpl boost/numeric/ublas boost/pool boost/program_options boost/property_tree/detail boost/python boost/random boost/spirit/home/support/detail/integer boost/test/impl boost/test/utils/runtime/file boost/type_traits boost/utility libs/config/test libs/interprocess/test libs/iostreams/src libs/iostreams/test libs/math/dot_net_example/boost_math libs/math/test libs/math/tools libs/numeric/ublas/test libs/optional/test libs/python/test libs/serialization/example libs/serialization/src libs/spirit/classic/example/intermediate/simple_xml libs/utility/swap/test tools/regression/src
From: jewillco_at_[hidden]
Date: 2009-05-20 15:19:09
Author: jewillco
Date: 2009-05-20 15:19:00 EDT (Wed, 20 May 2009)
New Revision: 53141
URL: http://svn.boost.org/trac/boost/changeset/53141
Log:
Fixed most tab and min/max issues from trunk inspection report
Text files modified:
trunk/boost/algorithm/string/detail/classification.hpp | 2
trunk/boost/archive/impl/text_iarchive_impl.ipp | 2
trunk/boost/date_time/date_parsing.hpp | 4
trunk/boost/exception/detail/exception_ptr_base.hpp | 22 +-
trunk/boost/format/parsing.hpp | 2
trunk/boost/interprocess/detail/move.hpp | 2
trunk/boost/interprocess/detail/workaround.hpp | 2
trunk/boost/interprocess/mapped_region.hpp | 5
trunk/boost/intrusive/priority_compare.hpp | 2
trunk/boost/iostreams/close.hpp | 16 +-
trunk/boost/iostreams/device/mapped_file.hpp | 2
trunk/boost/iostreams/filter/newline.hpp | 2
trunk/boost/math/distributions/detail/hypergeometric_pdf.hpp | 4
trunk/boost/math/special_functions/detail/fp_traits.hpp | 2
trunk/boost/math/special_functions/fpclassify.hpp | 8
trunk/boost/mpl/string.hpp | 14 +-
trunk/boost/numeric/ublas/functional.hpp | 266 ++++++++++++++++++++--------------------
trunk/boost/numeric/ublas/triangular.hpp | 42 +++---
trunk/boost/pool/pool_alloc.hpp | 16 +-
trunk/boost/program_options/positional_options.hpp | 2
trunk/boost/property_tree/detail/rapidxml.hpp | 24 +-
trunk/boost/property_tree/detail/translator_implementation.hpp | 6
trunk/boost/python/enum.hpp | 2
trunk/boost/python/make_constructor.hpp | 6
trunk/boost/random/uniform_int.hpp | 2
trunk/boost/spirit/home/support/detail/integer/endian.hpp | 10
trunk/boost/test/impl/unit_test_parameters.ipp | 4
trunk/boost/test/utils/runtime/file/config_file_iterator.cpp | 6
trunk/boost/type_traits/alignment_of.hpp | 10
trunk/boost/utility/result_of.hpp | 4
trunk/libs/config/test/boost_no_template_aliases.ipp | 2
trunk/libs/interprocess/test/message_queue_test.cpp | 6
trunk/libs/iostreams/src/file_descriptor.cpp | 2
trunk/libs/iostreams/src/file_times.cpp | 4
trunk/libs/iostreams/src/mapped_file.cpp | 26 +-
trunk/libs/iostreams/test/large_file_test.cpp | 4
trunk/libs/iostreams/test/mapped_file_test.cpp | 60 ++++----
trunk/libs/math/dot_net_example/boost_math/boost_math.h | 10
trunk/libs/math/test/test_laplace.cpp | 64 ++++----
trunk/libs/math/tools/hypergeometric_dist_data.cpp | 82 ++++++------
trunk/libs/numeric/ublas/test/triangular_layout.cpp | 234 +++++++++++++++++-----------------
trunk/libs/optional/test/optional_test_ref.cpp | 8
trunk/libs/python/test/map_indexing_suite.cpp | 2
trunk/libs/serialization/example/portable_binary_iarchive.hpp | 4
trunk/libs/serialization/src/extended_type_info_typeid.cpp | 4
trunk/libs/spirit/classic/example/intermediate/simple_xml/tag.hpp | 4
trunk/libs/utility/swap/test/std_bitset.cpp | 2
trunk/libs/utility/swap/test/swap_test_class.hpp | 2
trunk/tools/regression/src/library_status.cpp | 18 +-
49 files changed, 511 insertions(+), 518 deletions(-)
Modified: trunk/boost/algorithm/string/detail/classification.hpp
==============================================================================
--- trunk/boost/algorithm/string/detail/classification.hpp (original)
+++ trunk/boost/algorithm/string/detail/classification.hpp 2009-05-20 15:19:00 EDT (Wed, 20 May 2009)
@@ -171,7 +171,7 @@
// Check what kind of storage are we using right now
if(use_fixed_storage(m_Size))
{
- // Using fixed storage, allocate new
+ // Using fixed storage, allocate new
set_value_type* pTemp=new set_value_type[Other.m_Size];
DestStorage=pTemp;
m_Storage.m_dynSet=pTemp;
Modified: trunk/boost/archive/impl/text_iarchive_impl.ipp
==============================================================================
--- trunk/boost/archive/impl/text_iarchive_impl.ipp (original)
+++ trunk/boost/archive/impl/text_iarchive_impl.ipp 2009-05-20 15:19:00 EDT (Wed, 20 May 2009)
@@ -54,7 +54,7 @@
#endif
s.resize(size);
if(0 < size)
- is.read(&(*s.begin()), size);
+ is.read(&(*s.begin()), size);
}
#ifndef BOOST_NO_CWCHAR
Modified: trunk/boost/date_time/date_parsing.hpp
==============================================================================
--- trunk/boost/date_time/date_parsing.hpp (original)
+++ trunk/boost/date_time/date_parsing.hpp 2009-05-20 15:19:00 EDT (Wed, 20 May 2009)
@@ -78,8 +78,8 @@
* must contain 'size' elements. The index of the match is returned.
* If no match is found, 'size' is returned.
* Ex. "Jan" returns 0, "Dec" returns 11, "Tue" returns 2.
- * 'size' can be sent in with: greg_month::max() (which 12),
- * greg_weekday::max() + 1 (which is 7) or date_time::NumSpecialValues */
+ * 'size' can be sent in with: (greg_month::max)() (which 12),
+ * (greg_weekday::max)() + 1 (which is 7) or date_time::NumSpecialValues */
template<class charT>
short find_match(const charT* const* short_names,
const charT* const* long_names,
Modified: trunk/boost/exception/detail/exception_ptr_base.hpp
==============================================================================
--- trunk/boost/exception/detail/exception_ptr_base.hpp (original)
+++ trunk/boost/exception/detail/exception_ptr_base.hpp 2009-05-20 15:19:00 EDT (Wed, 20 May 2009)
@@ -9,18 +9,18 @@
namespace
boost
{
- namespace
- exception_detail
- {
- class
- exception_ptr_base
- {
- public:
+ namespace
+ exception_detail
+ {
+ class
+ exception_ptr_base
+ {
+ public:
- virtual void _rethrow() const=0;
- virtual bool _empty() const=0;
- };
- }
+ virtual void _rethrow() const=0;
+ virtual bool _empty() const=0;
+ };
+ }
}
#endif
Modified: trunk/boost/format/parsing.hpp
==============================================================================
--- trunk/boost/format/parsing.hpp (original)
+++ trunk/boost/format/parsing.hpp 2009-05-20 15:19:00 EDT (Wed, 20 May 2009)
@@ -48,7 +48,7 @@
#if ! defined( BOOST_NO_LOCALE_ISDIGIT )
return fac.is(std::ctype<Ch>::digit, c);
# else
- (void) fac; // remove "unused parameter" warning
+ (void) fac; // remove "unused parameter" warning
using namespace std;
return isdigit(c);
#endif
Modified: trunk/boost/interprocess/detail/move.hpp
==============================================================================
--- trunk/boost/interprocess/detail/move.hpp (original)
+++ trunk/boost/interprocess/detail/move.hpp 2009-05-20 15:19:00 EDT (Wed, 20 May 2009)
@@ -744,4 +744,4 @@
} //namespace interprocess {
} //namespace boost {
-#endif //#ifndef BOOST_INTERPROCESS_MOVE_HPP
+#endif //#ifndef BOOST_INTERPROCESS_MOVE_HPP
Modified: trunk/boost/interprocess/detail/workaround.hpp
==============================================================================
--- trunk/boost/interprocess/detail/workaround.hpp (original)
+++ trunk/boost/interprocess/detail/workaround.hpp 2009-05-20 15:19:00 EDT (Wed, 20 May 2009)
@@ -36,7 +36,7 @@
# define BOOST_INTERPROCESS_POSIX_PROCESS_SHARED
# endif
#endif
-
+
#if ((_POSIX_BARRIERS - 0) > 0)
# define BOOST_INTERPROCESS_POSIX_BARRIERS
# endif
Modified: trunk/boost/interprocess/mapped_region.hpp
==============================================================================
--- trunk/boost/interprocess/mapped_region.hpp (original)
+++ trunk/boost/interprocess/mapped_region.hpp 2009-05-20 15:19:00 EDT (Wed, 20 May 2009)
@@ -247,12 +247,9 @@
error_info err(winapi::get_last_error());
throw interprocess_exception(err);
}
- #ifdef max
- #undef max
- #endif
if(static_cast<unsigned __int64>(total_size) >
- std::numeric_limits<std::size_t>::max()){
+ (std::numeric_limits<std::size_t>::max)()){
error_info err(size_error);
throw interprocess_exception(err);
}
Modified: trunk/boost/intrusive/priority_compare.hpp
==============================================================================
--- trunk/boost/intrusive/priority_compare.hpp (original)
+++ trunk/boost/intrusive/priority_compare.hpp 2009-05-20 15:19:00 EDT (Wed, 20 May 2009)
@@ -23,7 +23,7 @@
template <class T>
struct priority_compare
- : public std::binary_function<T, T, bool>
+ : public std::binary_function<T, T, bool>
{
bool operator()(const T &val, const T &val2) const
{
Modified: trunk/boost/iostreams/close.hpp
==============================================================================
--- trunk/boost/iostreams/close.hpp (original)
+++ trunk/boost/iostreams/close.hpp 2009-05-20 15:19:00 EDT (Wed, 20 May 2009)
@@ -99,10 +99,10 @@
#ifdef BOOST_IOSTREAMS_STRICT
assert(which == BOOST_IOS::in || which == BOOST_IOS::out);
#else
- if (which == (BOOST_IOS::in | BOOST_IOS::out)) {
- detail::close_all(t);
- return;
- }
+ if (which == (BOOST_IOS::in | BOOST_IOS::out)) {
+ detail::close_all(t);
+ return;
+ }
#endif
detail::close_impl<T>::close(detail::unwrap(t), which);
}
@@ -113,10 +113,10 @@
#ifdef BOOST_IOSTREAMS_STRICT
assert(which == BOOST_IOS::in || which == BOOST_IOS::out);
#else
- if (which == (BOOST_IOS::in | BOOST_IOS::out)) {
- detail::close_all(t, snk);
- return;
- }
+ if (which == (BOOST_IOS::in | BOOST_IOS::out)) {
+ detail::close_all(t, snk);
+ return;
+ }
#endif
detail::close_impl<T>::close(detail::unwrap(t), snk, which);
}
Modified: trunk/boost/iostreams/device/mapped_file.hpp
==============================================================================
--- trunk/boost/iostreams/device/mapped_file.hpp (original)
+++ trunk/boost/iostreams/device/mapped_file.hpp 2009-05-20 15:19:00 EDT (Wed, 20 May 2009)
@@ -321,7 +321,7 @@
class BOOST_IOSTREAMS_DECL mapped_file_sink : private mapped_file {
public:
- friend struct boost::iostreams::operations<mapped_file_sink>;
+ friend struct boost::iostreams::operations<mapped_file_sink>;
using mapped_file::mapmode;
using mapped_file::readonly;
using mapped_file::readwrite;
Modified: trunk/boost/iostreams/filter/newline.hpp
==============================================================================
--- trunk/boost/iostreams/filter/newline.hpp (original)
+++ trunk/boost/iostreams/filter/newline.hpp 2009-05-20 15:19:00 EDT (Wed, 20 May 2009)
@@ -20,7 +20,7 @@
#include <stdexcept> // logic_error.
#include <boost/config.hpp> // BOOST_STATIC_CONSTANT.
#include <boost/iostreams/categories.hpp>
-#include <boost/iostreams/detail/char_traits.hpp>
+#include <boost/iostreams/detail/char_traits.hpp>
#include <boost/iostreams/detail/ios.hpp> // BOOST_IOSTREAMS_FAILURE
#include <boost/iostreams/read.hpp> // get
#include <boost/iostreams/write.hpp> // put
Modified: trunk/boost/math/distributions/detail/hypergeometric_pdf.hpp
==============================================================================
--- trunk/boost/math/distributions/detail/hypergeometric_pdf.hpp (original)
+++ trunk/boost/math/distributions/detail/hypergeometric_pdf.hpp 2009-05-20 15:19:00 EDT (Wed, 20 May 2009)
@@ -416,11 +416,11 @@
if(result > 1)
{
- result = 1;
+ result = 1;
}
if(result < 0)
{
- result = 0;
+ result = 0;
}
return policies::checked_narrowing_cast<result_type, forwarding_policy>(result, "boost::math::hypergeometric_pdf<%1%>(%1%,%1%,%1%,%1%)");
Modified: trunk/boost/math/special_functions/detail/fp_traits.hpp
==============================================================================
--- trunk/boost/math/special_functions/detail/fp_traits.hpp (original)
+++ trunk/boost/math/special_functions/detail/fp_traits.hpp 2009-05-20 15:19:00 EDT (Wed, 20 May 2009)
@@ -246,7 +246,7 @@
#endif
-#endif // #ifndef BOOST_FPCLASSIFY_VAX_FORMAT
+#endif // #ifndef BOOST_FPCLASSIFY_VAX_FORMAT
// long double (64 bits) -------------------------------------------------------
Modified: trunk/boost/math/special_functions/fpclassify.hpp
==============================================================================
--- trunk/boost/math/special_functions/fpclassify.hpp (original)
+++ trunk/boost/math/special_functions/fpclassify.hpp 2009-05-20 15:19:00 EDT (Wed, 20 May 2009)
@@ -51,8 +51,8 @@
Otherwise the number is normal.
- This algorithm works for the IEEE 754 representation,
- and also for several non IEEE 754 formats.
+ This algorithm works for the IEEE 754 representation,
+ and also for several non IEEE 754 formats.
Most formats have the structure
sign bit + exponent bits + significand bits.
@@ -60,8 +60,8 @@
A few have the structure
sign bit + exponent bits + flag bit + significand bits.
The flag bit is 0 for zero and subnormal numbers,
- and 1 for normal numbers and NaN.
- It is 0 (Motorola 68K) or 1 (Intel) for infinity.
+ and 1 for normal numbers and NaN.
+ It is 0 (Motorola 68K) or 1 (Intel) for infinity.
To get the bits, the four or eight most significant bytes are copied
into an uint32_t or uint64_t and bit masks are applied.
Modified: trunk/boost/mpl/string.hpp
==============================================================================
--- trunk/boost/mpl/string.hpp (original)
+++ trunk/boost/mpl/string.hpp 2009-05-20 15:19:00 EDT (Wed, 20 May 2009)
@@ -68,7 +68,7 @@
(((c)<<8)|(unsigned char)(i))
#define BOOST_MPL_MULTICHAR_POP_BACK(c) \
- (((1<<((BOOST_MPL_MULTICHAR_LENGTH(c)-1)*8))-1)&(c))
+ (((1<<((BOOST_MPL_MULTICHAR_LENGTH(c)-1)*8))-1)&(c))
#define BOOST_MPL_MULTICHAR_POP_FRONT(c) \
((c)>>8)
@@ -329,12 +329,12 @@
typename mpl::if_<
mpl::empty<mpl::string<BOOST_PP_ENUM_PARAMS(BOOST_MPL_STRING_MAX_PARAMS, C)> >
, mpl::string<(char)Value::value>
- , type0
- >::type
- type;
- #else
- typedef type0 type;
- #endif
+ , type0
+ >::type
+ type;
+ #else
+ typedef type0 type;
+ #endif
};
};
Modified: trunk/boost/numeric/ublas/functional.hpp
==============================================================================
--- trunk/boost/numeric/ublas/functional.hpp (original)
+++ trunk/boost/numeric/ublas/functional.hpp 2009-05-20 15:19:00 EDT (Wed, 20 May 2009)
@@ -446,7 +446,7 @@
size_type size (e ().size ());
for (size_type i = 0; i < size; ++ i) {
real_type u (type_traits<value_type>::norm_2 (e () (i)));
- if ( real_type () /* zero */ == u ) continue;
+ if ( real_type () /* zero */ == u ) continue;
if (scale < u) {
real_type v (scale / u);
sum_squares = sum_squares * v * v + real_type (1);
@@ -1727,7 +1727,7 @@
bool other (size_type /* i */, size_type /* j */) {
return true;
}
- // FIXME: this should not be used at all
+ // FIXME: this should not be used at all
static
BOOST_UBLAS_INLINE
size_type restrict1 (size_type i, size_type j) {
@@ -1751,81 +1751,81 @@
};
namespace detail {
- template < class L >
- struct transposed_structure {
- typedef typename L::size_type size_type;
-
- template<class LAYOUT>
- static
- BOOST_UBLAS_INLINE
- size_type packed_size (LAYOUT l, size_type size_i, size_type size_j) {
- return L::packed_size(l, size_j, size_i);
- }
-
- static
- BOOST_UBLAS_INLINE
- bool zero (size_type i, size_type j) {
- return L::zero(j, i);
- }
- static
- BOOST_UBLAS_INLINE
- bool one (size_type i, size_type j) {
- return L::one(j, i);
- }
- static
- BOOST_UBLAS_INLINE
- bool other (size_type i, size_type j) {
- return L::other(j, i);
- }
- template<class LAYOUT>
- static
- BOOST_UBLAS_INLINE
- size_type element (LAYOUT l, size_type i, size_type size_i, size_type j, size_type size_j) {
- return L::element(typename LAYOUT::transposed_layout(), j, size_j, i, size_i);
- }
-
- static
- BOOST_UBLAS_INLINE
- size_type restrict1 (size_type i, size_type j, size_type size1, size_type size2) {
- return L::restrict2(j, i, size2, size1);
- }
- static
- BOOST_UBLAS_INLINE
- size_type restrict2 (size_type i, size_type j, size_type size1, size_type size2) {
- return L::restrict1(j, i, size2, size1);
- }
- static
- BOOST_UBLAS_INLINE
- size_type mutable_restrict1 (size_type i, size_type j, size_type size1, size_type size2) {
- return L::mutable_restrict2(j, i, size2, size1);
- }
- static
- BOOST_UBLAS_INLINE
- size_type mutable_restrict2 (size_type i, size_type j, size_type size1, size_type size2) {
- return L::mutable_restrict1(j, i, size2, size1);
- }
-
- static
- BOOST_UBLAS_INLINE
- size_type global_restrict1 (size_type index1, size_type size1, size_type index2, size_type size2) {
- return L::global_restrict2(index2, size2, index1, size1);
- }
- static
- BOOST_UBLAS_INLINE
- size_type global_restrict2 (size_type index1, size_type size1, size_type index2, size_type size2) {
- return L::global_restrict1(index2, size2, index1, size1);
- }
- static
- BOOST_UBLAS_INLINE
- size_type global_mutable_restrict1 (size_type index1, size_type size1, size_type index2, size_type size2) {
- return L::global_mutable_restrict2(index2, size2, index1, size1);
- }
- static
- BOOST_UBLAS_INLINE
- size_type global_mutable_restrict2 (size_type index1, size_type size1, size_type index2, size_type size2) {
- return L::global_mutable_restrict1(index2, size2, index1, size1);
- }
- };
+ template < class L >
+ struct transposed_structure {
+ typedef typename L::size_type size_type;
+
+ template<class LAYOUT>
+ static
+ BOOST_UBLAS_INLINE
+ size_type packed_size (LAYOUT l, size_type size_i, size_type size_j) {
+ return L::packed_size(l, size_j, size_i);
+ }
+
+ static
+ BOOST_UBLAS_INLINE
+ bool zero (size_type i, size_type j) {
+ return L::zero(j, i);
+ }
+ static
+ BOOST_UBLAS_INLINE
+ bool one (size_type i, size_type j) {
+ return L::one(j, i);
+ }
+ static
+ BOOST_UBLAS_INLINE
+ bool other (size_type i, size_type j) {
+ return L::other(j, i);
+ }
+ template<class LAYOUT>
+ static
+ BOOST_UBLAS_INLINE
+ size_type element (LAYOUT l, size_type i, size_type size_i, size_type j, size_type size_j) {
+ return L::element(typename LAYOUT::transposed_layout(), j, size_j, i, size_i);
+ }
+
+ static
+ BOOST_UBLAS_INLINE
+ size_type restrict1 (size_type i, size_type j, size_type size1, size_type size2) {
+ return L::restrict2(j, i, size2, size1);
+ }
+ static
+ BOOST_UBLAS_INLINE
+ size_type restrict2 (size_type i, size_type j, size_type size1, size_type size2) {
+ return L::restrict1(j, i, size2, size1);
+ }
+ static
+ BOOST_UBLAS_INLINE
+ size_type mutable_restrict1 (size_type i, size_type j, size_type size1, size_type size2) {
+ return L::mutable_restrict2(j, i, size2, size1);
+ }
+ static
+ BOOST_UBLAS_INLINE
+ size_type mutable_restrict2 (size_type i, size_type j, size_type size1, size_type size2) {
+ return L::mutable_restrict1(j, i, size2, size1);
+ }
+
+ static
+ BOOST_UBLAS_INLINE
+ size_type global_restrict1 (size_type index1, size_type size1, size_type index2, size_type size2) {
+ return L::global_restrict2(index2, size2, index1, size1);
+ }
+ static
+ BOOST_UBLAS_INLINE
+ size_type global_restrict2 (size_type index1, size_type size1, size_type index2, size_type size2) {
+ return L::global_restrict1(index2, size2, index1, size1);
+ }
+ static
+ BOOST_UBLAS_INLINE
+ size_type global_mutable_restrict1 (size_type index1, size_type size1, size_type index2, size_type size2) {
+ return L::global_mutable_restrict2(index2, size2, index1, size1);
+ }
+ static
+ BOOST_UBLAS_INLINE
+ size_type global_mutable_restrict2 (size_type index1, size_type size1, size_type index2, size_type size2) {
+ return L::global_mutable_restrict1(index2, size2, index1, size1);
+ }
+ };
}
template <class Z>
@@ -1862,56 +1862,56 @@
return L::lower_element (i, size_i, j, size_j);
}
- // return nearest valid index in column j
+ // return nearest valid index in column j
static
BOOST_UBLAS_INLINE
size_type restrict1 (size_type i, size_type j, size_type size1, size_type size2) {
return (std::max)(j, (std::min) (size1, i));
}
- // return nearest valid index in row i
+ // return nearest valid index in row i
static
BOOST_UBLAS_INLINE
size_type restrict2 (size_type i, size_type j, size_type /* size1 */, size_type /* size2 */) {
return (std::max)(size_type(0), (std::min) (i+1, j));
}
- // return nearest valid mutable index in column j
+ // return nearest valid mutable index in column j
static
BOOST_UBLAS_INLINE
size_type mutable_restrict1 (size_type i, size_type j, size_type size1, size_type size2) {
return (std::max)(j, (std::min) (size1, i));
}
- // return nearest valid mutable index in row i
+ // return nearest valid mutable index in row i
static
BOOST_UBLAS_INLINE
size_type mutable_restrict2 (size_type i, size_type j, size_type /* size1 */, size_type /* size2 */) {
return (std::max)(size_type(0), (std::min) (i+1, j));
}
- // return an index between the first and (1+last) filled row
- static
- BOOST_UBLAS_INLINE
- size_type global_restrict1 (size_type index1, size_type size1, size_type index2, size_type size2) {
- return (std::max)(size_type(0), (std::min)(size1, index1) );
- }
- // return an index between the first and (1+last) filled column
- static
- BOOST_UBLAS_INLINE
- size_type global_restrict2 (size_type index1, size_type size1, size_type index2, size_type size2) {
- return (std::max)(size_type(0), (std::min)(size2, index2) );
- }
-
- // return an index between the first and (1+last) filled mutable row
- static
- BOOST_UBLAS_INLINE
- size_type global_mutable_restrict1 (size_type index1, size_type size1, size_type index2, size_type size2) {
- return (std::max)(size_type(0), (std::min)(size1, index1) );
- }
- // return an index between the first and (1+last) filled mutable column
- static
- BOOST_UBLAS_INLINE
- size_type global_mutable_restrict2 (size_type index1, size_type size1, size_type index2, size_type size2) {
- return (std::max)(size_type(0), (std::min)(size2, index2) );
- }
+ // return an index between the first and (1+last) filled row
+ static
+ BOOST_UBLAS_INLINE
+ size_type global_restrict1 (size_type index1, size_type size1, size_type index2, size_type size2) {
+ return (std::max)(size_type(0), (std::min)(size1, index1) );
+ }
+ // return an index between the first and (1+last) filled column
+ static
+ BOOST_UBLAS_INLINE
+ size_type global_restrict2 (size_type index1, size_type size1, size_type index2, size_type size2) {
+ return (std::max)(size_type(0), (std::min)(size2, index2) );
+ }
+
+ // return an index between the first and (1+last) filled mutable row
+ static
+ BOOST_UBLAS_INLINE
+ size_type global_mutable_restrict1 (size_type index1, size_type size1, size_type index2, size_type size2) {
+ return (std::max)(size_type(0), (std::min)(size1, index1) );
+ }
+ // return an index between the first and (1+last) filled mutable column
+ static
+ BOOST_UBLAS_INLINE
+ size_type global_mutable_restrict2 (size_type index1, size_type size1, size_type index2, size_type size2) {
+ return (std::max)(size_type(0), (std::min)(size2, index2) );
+ }
};
// the first row only contains a single 1. Thus it is not stored.
@@ -1959,19 +1959,19 @@
return (std::max)(size_type(0), (std::min) (i, j));
}
- // return an index between the first and (1+last) filled mutable row
- static
- BOOST_UBLAS_INLINE
- size_type global_mutable_restrict1 (size_type index1, size_type size1, size_type index2, size_type size2) {
- return (std::max)(size_type(1), (std::min)(size1, index1) );
- }
- // return an index between the first and (1+last) filled mutable column
- static
- BOOST_UBLAS_INLINE
- size_type global_mutable_restrict2 (size_type index1, size_type size1, size_type index2, size_type size2) {
- BOOST_UBLAS_CHECK( size2 >= 1 , external_logic() );
- return (std::max)(size_type(0), (std::min)(size2-1, index2) );
- }
+ // return an index between the first and (1+last) filled mutable row
+ static
+ BOOST_UBLAS_INLINE
+ size_type global_mutable_restrict1 (size_type index1, size_type size1, size_type index2, size_type size2) {
+ return (std::max)(size_type(1), (std::min)(size1, index1) );
+ }
+ // return an index between the first and (1+last) filled mutable column
+ static
+ BOOST_UBLAS_INLINE
+ size_type global_mutable_restrict2 (size_type index1, size_type size1, size_type index2, size_type size2) {
+ BOOST_UBLAS_CHECK( size2 >= 1 , external_logic() );
+ return (std::max)(size_type(0), (std::min)(size2-1, index2) );
+ }
};
// the first row only contains no element. Thus it is not stored.
@@ -2016,26 +2016,26 @@
static
BOOST_UBLAS_INLINE
size_type restrict1 (size_type i, size_type j, size_type size1, size_type size2) {
- return mutable_restrict1(i, j, size1, size2);
+ return mutable_restrict1(i, j, size1, size2);
}
static
BOOST_UBLAS_INLINE
size_type restrict2 (size_type i, size_type j, size_type size1, size_type size2) {
- return mutable_restrict2(i, j, size1, size2);
+ return mutable_restrict2(i, j, size1, size2);
}
- // return an index between the first and (1+last) filled row
- static
- BOOST_UBLAS_INLINE
- size_type global_restrict1 (size_type index1, size_type size1, size_type index2, size_type size2) {
- return global_mutable_restrict1(index1, size1, index2, size2);
- }
- // return an index between the first and (1+last) filled column
- static
- BOOST_UBLAS_INLINE
- size_type global_restrict2 (size_type index1, size_type size1, size_type index2, size_type size2) {
- return global_mutable_restrict2(index1, size1, index2, size2);
- }
+ // return an index between the first and (1+last) filled row
+ static
+ BOOST_UBLAS_INLINE
+ size_type global_restrict1 (size_type index1, size_type size1, size_type index2, size_type size2) {
+ return global_mutable_restrict1(index1, size1, index2, size2);
+ }
+ // return an index between the first and (1+last) filled column
+ static
+ BOOST_UBLAS_INLINE
+ size_type global_restrict2 (size_type index1, size_type size1, size_type index2, size_type size2) {
+ return global_mutable_restrict2(index1, size1, index2, size2);
+ }
};
Modified: trunk/boost/numeric/ublas/triangular.hpp
==============================================================================
--- trunk/boost/numeric/ublas/triangular.hpp (original)
+++ trunk/boost/numeric/ublas/triangular.hpp 2009-05-20 15:19:00 EDT (Wed, 20 May 2009)
@@ -296,32 +296,32 @@
const_iterator1 find1 (int rank, size_type i, size_type j) const {
if (rank == 1)
i = triangular_type::restrict1 (i, j, size1_, size2_);
- if (rank == 0)
- i = triangular_type::global_restrict1 (i, size1_, j, size2_);
+ if (rank == 0)
+ i = triangular_type::global_restrict1 (i, size1_, j, size2_);
return const_iterator1 (*this, i, j);
}
BOOST_UBLAS_INLINE
iterator1 find1 (int rank, size_type i, size_type j) {
if (rank == 1)
i = triangular_type::mutable_restrict1 (i, j, size1_, size2_);
- if (rank == 0)
- i = triangular_type::global_mutable_restrict1 (i, size1_, j, size2_);
+ if (rank == 0)
+ i = triangular_type::global_mutable_restrict1 (i, size1_, j, size2_);
return iterator1 (*this, i, j);
}
BOOST_UBLAS_INLINE
const_iterator2 find2 (int rank, size_type i, size_type j) const {
if (rank == 1)
j = triangular_type::restrict2 (i, j, size1_, size2_);
- if (rank == 0)
- j = triangular_type::global_restrict2 (i, size1_, j, size2_);
+ if (rank == 0)
+ j = triangular_type::global_restrict2 (i, size1_, j, size2_);
return const_iterator2 (*this, i, j);
}
BOOST_UBLAS_INLINE
iterator2 find2 (int rank, size_type i, size_type j) {
if (rank == 1)
j = triangular_type::mutable_restrict2 (i, j, size1_, size2_);
- if (rank == 0)
- j = triangular_type::global_mutable_restrict2 (i, size1_, j, size2_);
+ if (rank == 0)
+ j = triangular_type::global_mutable_restrict2 (i, size1_, j, size2_);
return iterator2 (*this, i, j);
}
@@ -1153,34 +1153,34 @@
BOOST_UBLAS_INLINE
const_iterator1 find1 (int rank, size_type i, size_type j) const {
if (rank == 1)
- i = triangular_type::restrict1 (i, j, size1(), size2());
- if (rank == 0)
- i = triangular_type::global_restrict1 (i, size1(), j, size2());
- return const_iterator1 (*this, data ().find1 (rank, i, j));
+ i = triangular_type::restrict1 (i, j, size1(), size2());
+ if (rank == 0)
+ i = triangular_type::global_restrict1 (i, size1(), j, size2());
+ return const_iterator1 (*this, data ().find1 (rank, i, j));
}
BOOST_UBLAS_INLINE
iterator1 find1 (int rank, size_type i, size_type j) {
if (rank == 1)
i = triangular_type::mutable_restrict1 (i, j, size1(), size2());
- if (rank == 0)
- i = triangular_type::global_mutable_restrict1 (i, size1(), j, size2());
- return iterator1 (*this, data ().find1 (rank, i, j));
+ if (rank == 0)
+ i = triangular_type::global_mutable_restrict1 (i, size1(), j, size2());
+ return iterator1 (*this, data ().find1 (rank, i, j));
}
BOOST_UBLAS_INLINE
const_iterator2 find2 (int rank, size_type i, size_type j) const {
if (rank == 1)
j = triangular_type::restrict2 (i, j, size1(), size2());
- if (rank == 0)
- j = triangular_type::global_restrict2 (i, size1(), j, size2());
- return const_iterator2 (*this, data ().find2 (rank, i, j));
+ if (rank == 0)
+ j = triangular_type::global_restrict2 (i, size1(), j, size2());
+ return const_iterator2 (*this, data ().find2 (rank, i, j));
}
BOOST_UBLAS_INLINE
iterator2 find2 (int rank, size_type i, size_type j) {
if (rank == 1)
j = triangular_type::mutable_restrict2 (i, j, size1(), size2());
- if (rank == 0)
- j = triangular_type::global_mutable_restrict2 (i, size1(), j, size2());
- return iterator2 (*this, data ().find2 (rank, i, j));
+ if (rank == 0)
+ j = triangular_type::global_mutable_restrict2 (i, size1(), j, size2());
+ return iterator2 (*this, data ().find2 (rank, i, j));
}
// Iterators simply are indices.
Modified: trunk/boost/pool/pool_alloc.hpp
==============================================================================
--- trunk/boost/pool/pool_alloc.hpp (original)
+++ trunk/boost/pool/pool_alloc.hpp 2009-05-20 15:19:00 EDT (Wed, 20 May 2009)
@@ -65,7 +65,7 @@
// initialization. See ticket #2359 for a complete explaination
// ( http://svn.boost.org/trac/boost/ticket/2359 )
singleton_pool<pool_allocator_tag, sizeof(T), UserAllocator, Mutex,
- NextSize>::is_from(0);
+ NextSize>::is_from(0);
}
// default copy constructor
@@ -81,7 +81,7 @@
// initialization. See ticket #2359 for a complete explaination
// ( http://svn.boost.org/trac/boost/ticket/2359 )
singleton_pool<pool_allocator_tag, sizeof(T), UserAllocator, Mutex,
- NextSize>::is_from(0);
+ NextSize>::is_from(0);
}
// default destructor
@@ -138,7 +138,7 @@
typedef const void* const_pointer;
typedef void value_type;
template <class U> struct rebind {
- typedef pool_allocator<U, UserAllocator, Mutex, NextSize> other;
+ typedef pool_allocator<U, UserAllocator, Mutex, NextSize> other;
};
};
@@ -177,7 +177,7 @@
// initialization. See ticket #2359 for a complete explaination
// ( http://svn.boost.org/trac/boost/ticket/2359 )
singleton_pool<fast_pool_allocator_tag, sizeof(T),
- UserAllocator, Mutex, NextSize>::is_from(0);
+ UserAllocator, Mutex, NextSize>::is_from(0);
}
// default copy constructor
@@ -194,7 +194,7 @@
// initialization. See ticket #2359 for a complete explaination
// ( http://svn.boost.org/trac/boost/ticket/2359 )
singleton_pool<fast_pool_allocator_tag, sizeof(T),
- UserAllocator, Mutex, NextSize>::is_from(0);
+ UserAllocator, Mutex, NextSize>::is_from(0);
}
// default destructor
@@ -228,7 +228,7 @@
singleton_pool<fast_pool_allocator_tag, sizeof(T),
UserAllocator, Mutex, NextSize>::ordered_malloc(n) );
if (ret == 0)
- boost::throw_exception(std::bad_alloc());
+ boost::throw_exception(std::bad_alloc());
return ret;
}
static pointer allocate(const size_type n, const void * const)
@@ -239,7 +239,7 @@
singleton_pool<fast_pool_allocator_tag, sizeof(T),
UserAllocator, Mutex, NextSize>::malloc() );
if (ret == 0)
- boost::throw_exception(std::bad_alloc());
+ boost::throw_exception(std::bad_alloc());
return ret;
}
static void deallocate(const pointer ptr, const size_type n)
@@ -273,7 +273,7 @@
typedef const void* const_pointer;
typedef void value_type;
template <class U> struct rebind {
- typedef fast_pool_allocator<U, UserAllocator, Mutex, NextSize> other;
+ typedef fast_pool_allocator<U, UserAllocator, Mutex, NextSize> other;
};
};
Modified: trunk/boost/program_options/positional_options.hpp
==============================================================================
--- trunk/boost/program_options/positional_options.hpp (original)
+++ trunk/boost/program_options/positional_options.hpp 2009-05-20 15:19:00 EDT (Wed, 20 May 2009)
@@ -41,7 +41,7 @@
add(const char* name, int max_count);
/** Returns the maximum number of positional options that can
- be present. Can return numeric_limits<unsigned>::max() to
+ be present. Can return (numeric_limits<unsigned>::max)() to
indicate unlimited number. */
unsigned max_total_count() const;
Modified: trunk/boost/property_tree/detail/rapidxml.hpp
==============================================================================
--- trunk/boost/property_tree/detail/rapidxml.hpp (original)
+++ trunk/boost/property_tree/detail/rapidxml.hpp 2009-05-20 15:19:00 EDT (Wed, 20 May 2009)
@@ -1479,28 +1479,28 @@
// Insert UTF8 sequence
if (code < 0x80) // 1 byte sequence
{
- text[0] = static_cast<unsigned char>(code);
+ text[0] = static_cast<unsigned char>(code);
text += 1;
}
else if (code < 0x800) // 2 byte sequence
{
- text[1] = static_cast<unsigned char>((code | 0x80) & 0xBF); code >>= 6;
- text[0] = static_cast<unsigned char>(code | 0xC0);
+ text[1] = static_cast<unsigned char>((code | 0x80) & 0xBF); code >>= 6;
+ text[0] = static_cast<unsigned char>(code | 0xC0);
text += 2;
}
- else if (code < 0x10000) // 3 byte sequence
+ else if (code < 0x10000) // 3 byte sequence
{
- text[2] = static_cast<unsigned char>((code | 0x80) & 0xBF); code >>= 6;
- text[1] = static_cast<unsigned char>((code | 0x80) & 0xBF); code >>= 6;
- text[0] = static_cast<unsigned char>(code | 0xE0);
+ text[2] = static_cast<unsigned char>((code | 0x80) & 0xBF); code >>= 6;
+ text[1] = static_cast<unsigned char>((code | 0x80) & 0xBF); code >>= 6;
+ text[0] = static_cast<unsigned char>(code | 0xE0);
text += 3;
}
- else if (code < 0x110000) // 4 byte sequence
+ else if (code < 0x110000) // 4 byte sequence
{
- text[3] = static_cast<unsigned char>((code | 0x80) & 0xBF); code >>= 6;
- text[2] = static_cast<unsigned char>((code | 0x80) & 0xBF); code >>= 6;
- text[1] = static_cast<unsigned char>((code | 0x80) & 0xBF); code >>= 6;
- text[0] = static_cast<unsigned char>(code | 0xF0);
+ text[3] = static_cast<unsigned char>((code | 0x80) & 0xBF); code >>= 6;
+ text[2] = static_cast<unsigned char>((code | 0x80) & 0xBF); code >>= 6;
+ text[1] = static_cast<unsigned char>((code | 0x80) & 0xBF); code >>= 6;
+ text[0] = static_cast<unsigned char>(code | 0xF0);
text += 4;
}
else // Invalid, only codes up to 0x10FFFF are allowed in Unicode
Modified: trunk/boost/property_tree/detail/translator_implementation.hpp
==============================================================================
--- trunk/boost/property_tree/detail/translator_implementation.hpp (original)
+++ trunk/boost/property_tree/detail/translator_implementation.hpp 2009-05-20 15:19:00 EDT (Wed, 20 May 2009)
@@ -70,7 +70,7 @@
stream.imbue(loc);
stream >> extracted;
if (!stream.eof())
- stream >> std::ws;
+ stream >> std::ws;
return stream.eof() && !stream.fail() && !stream.bad();
}
};
@@ -116,7 +116,7 @@
int tmp;
stream >> tmp;
if (!stream.eof())
- stream >> std::ws;
+ stream >> std::ws;
if (stream.eof() && !stream.fail() && !stream.bad())
{
extracted = static_cast<signed char>(tmp);
@@ -139,7 +139,7 @@
unsigned int tmp;
stream >> tmp;
if (!stream.eof())
- stream >> std::ws;
+ stream >> std::ws;
if (stream.eof() && !stream.fail() && !stream.bad())
{
extracted = static_cast<unsigned char>(tmp);
Modified: trunk/boost/python/enum.hpp
==============================================================================
--- trunk/boost/python/enum.hpp (original)
+++ trunk/boost/python/enum.hpp 2009-05-20 15:19:00 EDT (Wed, 20 May 2009)
@@ -41,7 +41,7 @@
, &enum_<T>::convertible_from_python
, &enum_<T>::construct
, type_id<T>()
- , doc
+ , doc
)
{
}
Modified: trunk/boost/python/make_constructor.hpp
==============================================================================
--- trunk/boost/python/make_constructor.hpp (original)
+++ trunk/boost/python/make_constructor.hpp 2009-05-20 15:19:00 EDT (Wed, 20 May 2009)
@@ -105,12 +105,12 @@
// If the BasePolicy_ supplied a result converter it would be
// ignored; issue an error if it's not the default.
#if defined _MSC_VER && _MSC_VER < 1300
- typedef is_same<
+ typedef is_same<
typename BasePolicy_::result_converter
, default_result_converter
> same_result_converter;
- //see above for explanation
- BOOST_STATIC_ASSERT(same_result_converter::value) ;
+ //see above for explanation
+ BOOST_STATIC_ASSERT(same_result_converter::value) ;
#else
BOOST_MPL_ASSERT_MSG(
(is_same<
Modified: trunk/boost/random/uniform_int.hpp
==============================================================================
--- trunk/boost/random/uniform_int.hpp (original)
+++ trunk/boost/random/uniform_int.hpp 2009-05-20 15:19:00 EDT (Wed, 20 May 2009)
@@ -152,7 +152,7 @@
// use rejection method to handle cases like 0..5 -> 0..4
for(;;) {
base_unsigned result =
- random::detail::subtract<base_result>()(eng(), bmin);
+ random::detail::subtract<base_result>()(eng(), bmin);
// result and range are non-negative, and result is possibly larger
// than range, so the cast is safe
if(result <= static_cast<base_unsigned>(range))
Modified: trunk/boost/spirit/home/support/detail/integer/endian.hpp
==============================================================================
--- trunk/boost/spirit/home/support/detail/integer/endian.hpp (original)
+++ trunk/boost/spirit/home/support/detail/integer/endian.hpp 2009-05-20 15:19:00 EDT (Wed, 20 May 2009)
@@ -195,7 +195,7 @@
return detail::load_big_endian<T, n_bits/8>(m_value);
}
private:
- char m_value[n_bits/8];
+ char m_value[n_bits/8];
};
// unaligned little endian specialization
@@ -227,7 +227,7 @@
return detail::load_little_endian<T, n_bits/8>(m_value);
}
private:
- char m_value[n_bits/8];
+ char m_value[n_bits/8];
};
// unaligned native endian specialization
@@ -254,7 +254,7 @@
operator T() const { return detail::load_little_endian<T, n_bits/8>(m_value); }
# endif
private:
- char m_value[n_bits/8];
+ char m_value[n_bits/8];
};
// Specializations that mimic built-in integer types.
@@ -285,7 +285,7 @@
operator T() const { return detail::load_big_endian<T, sizeof(T)>(&m_value); }
# endif
private:
- T m_value;
+ T m_value;
};
// aligned little endian specialization
@@ -313,7 +313,7 @@
operator T() const { return detail::load_little_endian<T, sizeof(T)>(&m_value); }
#endif
private:
- T m_value;
+ T m_value;
};
// naming convention typedefs ------------------------------------------------------//
Modified: trunk/boost/test/impl/unit_test_parameters.ipp
==============================================================================
--- trunk/boost/test/impl/unit_test_parameters.ipp (original)
+++ trunk/boost/test/impl/unit_test_parameters.ipp 2009-05-20 15:19:00 EDT (Wed, 20 May 2009)
@@ -220,9 +220,9 @@
boost::optional<T> v;
- #ifndef UNDER_CE
+ #ifndef UNDER_CE
env::get( parameter_2_env_var[parameter_name], v );
- #endif
+ #endif
return v? *v : default_value;
}
Modified: trunk/boost/test/utils/runtime/file/config_file_iterator.cpp
==============================================================================
--- trunk/boost/test/utils/runtime/file/config_file_iterator.cpp (original)
+++ trunk/boost/test/utils/runtime/file/config_file_iterator.cpp 2009-05-20 15:19:00 EDT (Wed, 20 May 2009)
@@ -18,7 +18,7 @@
#include <boost/test/utils/runtime/file/config_file_iterator.hpp>
#include <boost/test/utils/runtime/validation.hpp>
-#ifndef UNDER_CE
+#ifndef UNDER_CE
#include <boost/test/utils/runtime/env/environment.hpp>
#endif
@@ -355,9 +355,9 @@
if( it == m_symbols_table.end() ) {
boost::optional<cstring> macro_value; // !! variable actually may have different type
- #ifndef UNDER_CE
+ #ifndef UNDER_CE
env::get( macro_name, macro_value );
- #endif
+ #endif
BOOST_RT_PARAM_VALIDATE_LOGIC( macro_value || ignore_missing || !m_detect_missing_macro,
BOOST_RT_PARAM_LITERAL( "Unknown macro \"" ) << macro_name << BOOST_RT_PARAM_LITERAL( "\"" ) );
Modified: trunk/boost/type_traits/alignment_of.hpp
==============================================================================
--- trunk/boost/type_traits/alignment_of.hpp (original)
+++ trunk/boost/type_traits/alignment_of.hpp 2009-05-20 15:19:00 EDT (Wed, 20 May 2009)
@@ -57,11 +57,11 @@
struct alignment_of_impl
{
#if defined(BOOST_MSVC) && (BOOST_MSVC >= 1400)
- //
- // With MSVC both the native __alignof operator
- // and our own logic gets things wrong from time to time :-(
- // Using a combination of the two seems to make the most of a bad job:
- //
+ //
+ // With MSVC both the native __alignof operator
+ // and our own logic gets things wrong from time to time :-(
+ // Using a combination of the two seems to make the most of a bad job:
+ //
BOOST_STATIC_CONSTANT(std::size_t, value =
(::boost::detail::alignment_logic<
sizeof(::boost::detail::alignment_of_hack<T>) - sizeof(T),
Modified: trunk/boost/utility/result_of.hpp
==============================================================================
--- trunk/boost/utility/result_of.hpp (original)
+++ trunk/boost/utility/result_of.hpp 2009-05-20 15:19:00 EDT (Wed, 20 May 2009)
@@ -81,8 +81,8 @@
template<typename F, typename FArgs>
struct result_of_impl<F, FArgs, false>
: mpl::if_<is_function_with_no_args<FArgs>,
- result_of_void_impl<F>,
- result_of_nested_result<F, FArgs> >::type
+ result_of_void_impl<F>,
+ result_of_nested_result<F, FArgs> >::type
{};
} // end namespace detail
Modified: trunk/libs/config/test/boost_no_template_aliases.ipp
==============================================================================
--- trunk/libs/config/test/boost_no_template_aliases.ipp (original)
+++ trunk/libs/config/test/boost_no_template_aliases.ipp 2009-05-20 15:19:00 EDT (Wed, 20 May 2009)
@@ -12,7 +12,7 @@
namespace boost_no_template_aliases {
-using PINT = void (*)(int); // using plus C-style type
+using PINT = void (*)(int); // using plus C-style type
int test()
{
Modified: trunk/libs/interprocess/test/message_queue_test.cpp
==============================================================================
--- trunk/libs/interprocess/test/message_queue_test.cpp (original)
+++ trunk/libs/interprocess/test/message_queue_test.cpp 2009-05-20 15:19:00 EDT (Wed, 20 May 2009)
@@ -23,10 +23,6 @@
#include <string>
#include "get_process_id_name.hpp"
-#ifdef max
-#undef max
-#endif
-
////////////////////////////////////////////////////////////////////////////////
// //
// This example tests the process shared message queue. //
@@ -60,7 +56,7 @@
mq1.send(&tstamp, sizeof(tstamp), (unsigned int)(i%10));
}
- unsigned int priority_prev = std::numeric_limits<unsigned int>::max();
+ unsigned int priority_prev = (std::numeric_limits<unsigned int>::max)();
std::size_t tstamp_prev = 0;
//Receive all messages and test those are ordered
Modified: trunk/libs/iostreams/src/file_descriptor.cpp
==============================================================================
--- trunk/libs/iostreams/src/file_descriptor.cpp (original)
+++ trunk/libs/iostreams/src/file_descriptor.cpp 2009-05-20 15:19:00 EDT (Wed, 20 May 2009)
@@ -268,7 +268,7 @@
throw system_failure("failed seeking");
} else {
return offset_to_position(
- (stream_offset(lDistanceToMoveHigh) << 32) + dwResultLow
+ (stream_offset(lDistanceToMoveHigh) << 32) + dwResultLow
);
}
#else // #ifdef BOOST_IOSTREAMS_WINDOWS
Modified: trunk/libs/iostreams/src/file_times.cpp
==============================================================================
--- trunk/libs/iostreams/src/file_times.cpp (original)
+++ trunk/libs/iostreams/src/file_times.cpp 2009-05-20 15:19:00 EDT (Wed, 20 May 2009)
@@ -68,7 +68,7 @@
{
#ifdef BOOST_IOSTREAMS_WINDOWS
struct std::tm* t = std::gmtime(&tm);
- if (t == NULL)
+ if (t == NULL)
throw_system_failure("failed settting last access time");
SYSTEMTIME st_access;
st_access.wSecond = t->tm_sec;
@@ -125,7 +125,7 @@
{
#ifdef BOOST_IOSTREAMS_WINDOWS
struct std::tm* t = std::gmtime(&tm);
- if (t == NULL)
+ if (t == NULL)
throw_system_failure("failed settting last modification time");
SYSTEMTIME st_modification;
st_modification.wSecond = t->tm_sec;
Modified: trunk/libs/iostreams/src/mapped_file.cpp
==============================================================================
--- trunk/libs/iostreams/src/mapped_file.cpp (original)
+++ trunk/libs/iostreams/src/mapped_file.cpp 2009-05-20 15:19:00 EDT (Wed, 20 May 2009)
@@ -55,7 +55,7 @@
mapmode flags() const { return params_.flags; }
std::size_t size() const { return size_; }
char* data() const { return data_; }
- void resize(stream_offset new_size);
+ void resize(stream_offset new_size);
static int alignment();
private:
void open_file(param_type p);
@@ -99,23 +99,23 @@
#ifdef BOOST_IOSTREAMS_WINDOWS
!::CloseHandle(handle_)
#else
- ::close(handle_) != 0
+ ::close(handle_) != 0
#endif
|| error;
- clear(error);
+ clear(error);
if (error)
- throw_system_failure("failed closing mapped file");
+ throw_system_failure("failed closing mapped file");
}
void mapped_file_impl::resize(stream_offset new_size)
{
if (!is_open())
throw BOOST_IOSTREAMS_FAILURE("file is closed");
- if (flags() & mapped_file::priv)
+ if (flags() & mapped_file::priv)
throw BOOST_IOSTREAMS_FAILURE("can't resize private mapped file");
- if (!(flags() & mapped_file::readwrite))
+ if (!(flags() & mapped_file::readwrite))
throw BOOST_IOSTREAMS_FAILURE("can't resize readonly mapped file");
- if (params_.offset >= new_size)
+ if (params_.offset >= new_size)
throw BOOST_IOSTREAMS_FAILURE("can't resize below mapped offset");
if (!unmap_file())
cleanup_and_throw("failed unmapping file");
@@ -274,12 +274,12 @@
void mapped_file_impl::try_map_file(param_type p)
{
- bool priv = p.flags == mapped_file::priv;
+ bool priv = p.flags == mapped_file::priv;
bool readonly = p.flags == mapped_file::readonly;
#ifdef BOOST_IOSTREAMS_WINDOWS
// Create mapping
- DWORD protect = priv ?
+ DWORD protect = priv ?
PAGE_WRITECOPY :
readonly ?
PAGE_READONLY :
@@ -372,17 +372,17 @@
void mapped_file_impl::cleanup_and_throw(const char* msg)
{
#ifdef BOOST_IOSTREAMS_WINDOWS
- DWORD error = GetLastError();
+ DWORD error = GetLastError();
if (mapped_handle_ != INVALID_HANDLE_VALUE)
::CloseHandle(mapped_handle_);
if (handle_ != NULL)
::CloseHandle(handle_);
- SetLastError(error);
+ SetLastError(error);
#else
- int error = errno;
+ int error = errno;
if (handle_ != 0)
::close(handle_);
- errno = error;
+ errno = error;
#endif
clear(true);
boost::iostreams::detail::throw_system_failure(msg);
Modified: trunk/libs/iostreams/test/large_file_test.cpp
==============================================================================
--- trunk/libs/iostreams/test/large_file_test.cpp (original)
+++ trunk/libs/iostreams/test/large_file_test.cpp 2009-05-20 15:19:00 EDT (Wed, 20 May 2009)
@@ -292,7 +292,7 @@
// Close file
CloseHandle(hnd);
- return true;
+ return true;
# endif // Borland workaround
#else // #ifdef BOOST_IOSTREAMS_WINDOWS
@@ -343,7 +343,7 @@
// Close file
BOOST_IOSTREAMS_FD_CLOSE(fd);
- return true;
+ return true;
# else // Cygwin
Modified: trunk/libs/iostreams/test/mapped_file_test.cpp
==============================================================================
--- trunk/libs/iostreams/test/mapped_file_test.cpp (original)
+++ trunk/libs/iostreams/test/mapped_file_test.cpp 2009-05-20 15:19:00 EDT (Wed, 20 May 2009)
@@ -48,15 +48,15 @@
bool test_resizeable(mapped_file& mf)
{
// Test resizing
- mapped_file::size_type size = mf.size();
- if (size == 0)
- return false;
- mf.resize(size/2);
- if (mf.size() != size/2)
- return false;
- mf.resize(size);
- if (mf.size() != size)
- return false;
+ mapped_file::size_type size = mf.size();
+ if (size == 0)
+ return false;
+ mf.resize(size/2);
+ if (mf.size() != size/2)
+ return false;
+ mf.resize(size);
+ if (mf.size() != size)
+ return false;
return true;
}
@@ -75,10 +75,10 @@
// Test reading from a stream based on a mapped_file_source,
// in chars.
- boost::iostreams::test::test_file test1, test2;
- boost::iostreams::stream<mapped_file_source> first(test1.name());
+ boost::iostreams::test::test_file test1, test2;
+ boost::iostreams::stream<mapped_file_source> first(test1.name());
{
- std::ifstream second( test2.name().c_str(),
+ std::ifstream second( test2.name().c_str(),
BOOST_IOS::in | BOOST_IOS::binary );
BOOST_CHECK_MESSAGE(
boost::iostreams::test::compare_streams_in_chars(first, second),
@@ -93,9 +93,9 @@
// Test reading from a stream based on a mapped_file_source,
// in chunks. (Also tests reopening the stream.)
- first.open(mapped_file_source(test1.name()));
+ first.open(mapped_file_source(test1.name()));
{
- std::ifstream second( test2.name().c_str(),
+ std::ifstream second( test2.name().c_str(),
BOOST_IOS::in | BOOST_IOS::binary );
BOOST_CHECK_MESSAGE(
boost::iostreams::test::compare_streams_in_chunks(first, second),
@@ -116,8 +116,8 @@
boost::iostreams::test::uppercase_file first, second; // Will overwrite these.
boost::iostreams::test::test_file test;
- boost::iostreams::stream<mapped_file_sink> out;
- out.open(mapped_file_sink(first.name()));
+ boost::iostreams::stream<mapped_file_sink> out;
+ out.open(mapped_file_sink(first.name()));
boost::iostreams::test::write_data_in_chars(out);
out.close();
BOOST_CHECK_MESSAGE(
@@ -131,7 +131,7 @@
// Test writing to a stream based on a mapped_file_sink, in
// chunks. (Also tests reopening the stream.)
- out.open(mapped_file_sink(second.name()));
+ out.open(mapped_file_sink(second.name()));
boost::iostreams::test::write_data_in_chunks(out);
out.close();
BOOST_CHECK_MESSAGE(
@@ -151,10 +151,10 @@
boost::iostreams::test::temp_file first, second;
boost::iostreams::test::test_file test;
- mapped_file_params p(first.name());
+ mapped_file_params p(first.name());
p.new_file_size = boost::iostreams::test::data_reps * boost::iostreams::test::data_length();
- boost::iostreams::stream<mapped_file_sink> out;
- out.open(mapped_file_sink(p));
+ boost::iostreams::stream<mapped_file_sink> out;
+ out.open(mapped_file_sink(p));
boost::iostreams::test::write_data_in_chars(out);
out.close();
BOOST_CHECK_MESSAGE(
@@ -166,7 +166,7 @@
// Test writing to a newly created mapped file.
// (Also tests reopening the stream.)
p.path = second.name();
- out.open(mapped_file_sink(p));
+ out.open(mapped_file_sink(p));
boost::iostreams::test::write_data_in_chunks(out);
out.close();
BOOST_CHECK_MESSAGE(
@@ -181,8 +181,8 @@
// Test reading, writing and seeking within a stream based on a
// mapped_file, in chars.
boost::iostreams::test::test_file test;
- boost::iostreams::stream<mapped_file> io;
- io.open(mapped_file(test.name()));
+ boost::iostreams::stream<mapped_file> io;
+ io.open(mapped_file(test.name()));
BOOST_CHECK_MESSAGE(
boost::iostreams::test::test_seekable_in_chars(io),
"failed seeking within stream<mapped_file> in chars"
@@ -197,7 +197,7 @@
// Test reading, writing and seeking within a stream based on a
// mapped_file, in chunks. (Also tests reopening the
// stream.)
- io.open(mapped_file(test.name()));
+ io.open(mapped_file(test.name()));
BOOST_CHECK_MESSAGE(
boost::iostreams::test::test_seekable_in_chunks(io),
"failed seeking within stream<mapped_file> in chunks"
@@ -220,7 +220,7 @@
"failed resizing a mapped_file"
);
- BOOST_MESSAGE(
+ BOOST_MESSAGE(
"done resizing a mapped_file"
);
}
@@ -228,7 +228,7 @@
//--------------Random access with a private mapped_file------------------//
{
- // Use 2 copies of the file to compare later
+ // Use 2 copies of the file to compare later
boost::iostreams::test::test_file orig, copy;
// Test reading and writing within a mapped_file.
@@ -245,14 +245,14 @@
"failed writing to private mapped_file"
);
- BOOST_MESSAGE(
+ BOOST_MESSAGE(
"done seeking within private mapped_file"
);
- mf.close();
+ mf.close();
// Test reopening the mapped file.
- mf.open(orig.name(), mapped_file::priv);
+ mf.open(orig.name(), mapped_file::priv);
BOOST_CHECK_MESSAGE(
boost::iostreams::test::test_writeable(mf),
"failed reopening private mapped_file"
@@ -262,7 +262,7 @@
"failed writing to reopened private mapped_file"
);
- BOOST_MESSAGE(
+ BOOST_MESSAGE(
"done reopening private mapped_file"
);
}
Modified: trunk/libs/math/dot_net_example/boost_math/boost_math.h
==============================================================================
--- trunk/libs/math/dot_net_example/boost_math/boost_math.h (original)
+++ trunk/libs/math/dot_net_example/boost_math/boost_math.h 2009-05-20 15:19:00 EDT (Wed, 20 May 2009)
@@ -152,10 +152,10 @@
Distribution m_dist;
};
- public ref class any_distribution
- {
- public:
- // Added methods for this class here.
+ public ref class any_distribution
+ {
+ public:
+ // Added methods for this class here.
any_distribution(int t, double arg1, double arg2, double arg3);
~any_distribution()
{
@@ -324,5 +324,5 @@
pimpl = p;
}
any_imp* pimpl;
- };
+ };
}
Modified: trunk/libs/math/test/test_laplace.cpp
==============================================================================
--- trunk/libs/math/test/test_laplace.cpp (original)
+++ trunk/libs/math/test/test_laplace.cpp 2009-05-20 15:19:00 EDT (Wed, 20 May 2009)
@@ -27,7 +27,7 @@
Checks the relation between hazard, pdf and cdf.
hazard = pdf/(1-cdf)
-
+
Test 4: test_location_scale_symmetry()
Checks the pdf, cdf invariant for translation and scaling invariant
cdf(x,location,scale) = cdf( (x-location)/scale, 0, 1)
@@ -292,7 +292,7 @@
for (int i=0; i<7; ++i)
{
- RealType x( static_cast<RealType>(xtest[i]) );
+ RealType x( static_cast<RealType>(xtest[i]) );
RealType x2( quantile(laplace_distribution<RealType>(), cdf(laplace_distribution<RealType>(), x)) );
BOOST_CHECK_CLOSE( x, x2, tolerance);
}
@@ -327,22 +327,22 @@
for (int xi=0; xi<7; ++xi)
for (int li=0; li<7; ++li)
- for (int si=0; si<3; ++si)
+ for (int si=0; si<3; ++si)
{
RealType x( static_cast<RealType>(xtest[xi]) );
RealType l( static_cast<RealType>(ltest[li]) );
RealType s( static_cast<RealType>(stest[si]) );
RealType x0( (x-l)/s );
- BOOST_CHECK_CLOSE(
- pdf(laplace_distribution<RealType>(l,s), x) * s,
- pdf(laplace_distribution<RealType>(), x0),
- tolerance);
-
- BOOST_CHECK_CLOSE(
- cdf(laplace_distribution<RealType>(l,s), x),
- cdf(laplace_distribution<RealType>(), x0),
- tolerance);
+ BOOST_CHECK_CLOSE(
+ pdf(laplace_distribution<RealType>(l,s), x) * s,
+ pdf(laplace_distribution<RealType>(), x0),
+ tolerance);
+
+ BOOST_CHECK_CLOSE(
+ cdf(laplace_distribution<RealType>(l,s), x),
+ cdf(laplace_distribution<RealType>(), x0),
+ tolerance);
}
}
@@ -358,47 +358,47 @@
for (int xi=0; xi<7; ++xi)
for (int li=0; li<7; ++li)
- for (int si=0; si<3; ++si)
+ for (int si=0; si<3; ++si)
{
//RealType x( static_cast<RealType>(xtest[xi]) );
RealType l( static_cast<RealType>(ltest[li]) );
RealType s( static_cast<RealType>(stest[si]) );
BOOST_CHECK_CLOSE(
- mean( laplace_distribution<RealType>(l,s) ),
+ mean( laplace_distribution<RealType>(l,s) ),
l,
- tolerance);
+ tolerance);
BOOST_CHECK_CLOSE(
- median( laplace_distribution<RealType>(l,s) ),
+ median( laplace_distribution<RealType>(l,s) ),
l,
- tolerance);
+ tolerance);
BOOST_CHECK_CLOSE(
- mode( laplace_distribution<RealType>(l,s) ),
+ mode( laplace_distribution<RealType>(l,s) ),
l,
- tolerance);
+ tolerance);
BOOST_CHECK_CLOSE(
- standard_deviation( laplace_distribution<RealType>(l,s) ),
+ standard_deviation( laplace_distribution<RealType>(l,s) ),
static_cast<RealType>( s * boost::math::constants::root_two<RealType>() ),
- tolerance);
+ tolerance);
BOOST_CHECK_CLOSE(
- skewness( laplace_distribution<RealType>(l,s) ),
+ skewness( laplace_distribution<RealType>(l,s) ),
static_cast<RealType>(0),
- tolerance);
+ tolerance);
BOOST_CHECK_CLOSE(
- kurtosis( laplace_distribution<RealType>(l,s) ),
+ kurtosis( laplace_distribution<RealType>(l,s) ),
static_cast<RealType>(6),
- tolerance);
+ tolerance);
BOOST_CHECK_CLOSE(
- kurtosis_excess( laplace_distribution<RealType>(l,s) ),
+ kurtosis_excess( laplace_distribution<RealType>(l,s) ),
static_cast<RealType>(3),
- tolerance);
+ tolerance);
}
} // template <class RealType> void test_mmm_moments()
@@ -413,7 +413,7 @@
const float stest[3] = { 0.5, 1.0, 2.0 };
for (int li=0; li<7; ++li)
- for (int si=0; si<3; ++si)
+ for (int si=0; si<3; ++si)
{
RealType l( static_cast<RealType>(ltest[li]) );
RealType s( static_cast<RealType>(stest[si]) );
@@ -423,9 +423,9 @@
RealType x( static_cast<RealType>(xtest[xi]) );
BOOST_CHECK_CLOSE(
- cdf(complement(laplace_distribution<RealType>(l,s), -x)),
+ cdf(complement(laplace_distribution<RealType>(l,s), -x)),
cdf(laplace_distribution<RealType>(l,s), x),
- tolerance);
+ tolerance);
}
for (int pi=0; pi<5; ++pi)
@@ -433,9 +433,9 @@
RealType p( static_cast<RealType>(ptest[pi]) );
BOOST_CHECK_CLOSE(
- quantile(complement(laplace_distribution<RealType>(l,s), 1-p )),
+ quantile(complement(laplace_distribution<RealType>(l,s), 1-p )),
quantile(laplace_distribution<RealType>(l,s), p),
- tolerance);
+ tolerance);
}
}
} // void test_complemented()
Modified: trunk/libs/math/tools/hypergeometric_dist_data.cpp
==============================================================================
--- trunk/libs/math/tools/hypergeometric_dist_data.cpp (original)
+++ trunk/libs/math/tools/hypergeometric_dist_data.cpp 2009-05-20 15:19:00 EDT (Wed, 20 May 2009)
@@ -24,48 +24,48 @@
struct hypergeometric_generator
{
std::tr1::tuple<
- boost::math::ntl::RR,
- boost::math::ntl::RR,
- boost::math::ntl::RR,
- boost::math::ntl::RR,
- boost::math::ntl::RR,
- boost::math::ntl::RR,
- boost::math::ntl::RR> operator()(boost::math::ntl::RR rN, boost::math::ntl::RR rr, boost::math::ntl::RR rn)
+ boost::math::ntl::RR,
+ boost::math::ntl::RR,
+ boost::math::ntl::RR,
+ boost::math::ntl::RR,
+ boost::math::ntl::RR,
+ boost::math::ntl::RR,
+ boost::math::ntl::RR> operator()(boost::math::ntl::RR rN, boost::math::ntl::RR rr, boost::math::ntl::RR rn)
{
- using namespace std;
- using namespace boost;
- using namespace boost::math;
-
- if((rr > rN) || (rr < rn))
- throw std::domain_error("");
-
- try{
- int N = itrunc(rN);
- int r = itrunc(rr);
- int n = itrunc(rn);
- uniform_int<> ui((std::max)(0, n + r - N), (std::min)(n, r));
- int k = ui(rnd);
-
- hypergeometric_distribution<ntl::RR> d(r, n, N);
-
- ntl::RR p = pdf(d, k);
- if((p == 1) || (p == 0))
- {
- // trivial case, don't clutter up our table with it:
- throw std::domain_error("");
- }
- ntl::RR c = cdf(d, k);
- ntl::RR cc = cdf(complement(d, k));
-
- std::cout << "N = " << N << " r = " << r << " n = " << n << " PDF = " << p << " CDF = " << c << " CCDF = " << cc << std::endl;
-
- return tr1::make_tuple(r, n, N, k, p, c, cc);
- }
- catch(const std::exception& e)
- {
- std::cout << e.what() << std::endl;
- throw std::domain_error("");
- }
+ using namespace std;
+ using namespace boost;
+ using namespace boost::math;
+
+ if((rr > rN) || (rr < rn))
+ throw std::domain_error("");
+
+ try{
+ int N = itrunc(rN);
+ int r = itrunc(rr);
+ int n = itrunc(rn);
+ uniform_int<> ui((std::max)(0, n + r - N), (std::min)(n, r));
+ int k = ui(rnd);
+
+ hypergeometric_distribution<ntl::RR> d(r, n, N);
+
+ ntl::RR p = pdf(d, k);
+ if((p == 1) || (p == 0))
+ {
+ // trivial case, don't clutter up our table with it:
+ throw std::domain_error("");
+ }
+ ntl::RR c = cdf(d, k);
+ ntl::RR cc = cdf(complement(d, k));
+
+ std::cout << "N = " << N << " r = " << r << " n = " << n << " PDF = " << p << " CDF = " << c << " CCDF = " << cc << std::endl;
+
+ return tr1::make_tuple(r, n, N, k, p, c, cc);
+ }
+ catch(const std::exception& e)
+ {
+ std::cout << e.what() << std::endl;
+ throw std::domain_error("");
+ }
}
};
Modified: trunk/libs/numeric/ublas/test/triangular_layout.cpp
==============================================================================
--- trunk/libs/numeric/ublas/test/triangular_layout.cpp (original)
+++ trunk/libs/numeric/ublas/test/triangular_layout.cpp 2009-05-20 15:19:00 EDT (Wed, 20 May 2009)
@@ -14,126 +14,126 @@
int main(int argc, char* argv[])
{
- int sz = 4;
- ublas::symmetric_matrix<int, ublas::upper, ublas::column_major> UpCol (sz, sz);
- ublas::symmetric_matrix<int, ublas::upper, ublas::row_major> UpRow (sz, sz);
- ublas::symmetric_matrix<int, ublas::lower, ublas::column_major> LoCol (sz, sz);
- ublas::symmetric_matrix<int, ublas::lower, ublas::row_major> LoRow (sz, sz);
-
- ublas::triangular_matrix<int, ublas::upper, ublas::column_major> TrUpCol (sz, sz);
- ublas::triangular_matrix<int, ublas::upper, ublas::row_major> TrUpRow (sz, sz);
- ublas::triangular_matrix<int, ublas::lower, ublas::column_major> TrLoCol (sz, sz);
- ublas::triangular_matrix<int, ublas::lower, ublas::row_major> TrLoRow (sz, sz);
-
- for(int i=0; i<sz; ++i)
- for(int j=i; j<sz; ++j)
- {
- // Symmetric
- UpCol(i,j) = 10*i + j;
- UpRow(i,j) = 10*i + j;
- LoCol(i,j) = 10*i + j;
- LoRow(i,j) = 10*i + j;
- // Triangular
- TrUpCol(i,j) = 10*i + j;
- TrUpRow(i,j) = 10*i + j;
- TrLoCol(j,i) = 10*i + j;
- TrLoRow(j,i) = 10*i + j;
- }
-
- //get pointers to data
- int* uc = &(UpCol.data()[0]);
- int* ur = &(UpRow.data()[0]);
- int* lc = &(LoCol.data()[0]);
- int* lr = &(LoRow.data()[0]);
- int* tuc = &(TrUpCol.data()[0]);
- int* tur = &(TrUpRow.data()[0]);
- int* tlc = &(TrLoCol.data()[0]);
- int* tlr = &(TrLoRow.data()[0]);
-
- // upper, column_major
- // storage should be: 0 1 11 2 12 22 3 13 23 33
- int uc_correct[] = {0, 1, 11, 2, 12, 22, 3, 13, 23, 33};
-
- // upper, row_major
- // storage should be: 0 1 2 3 11 12 13 22 23 33
- int ur_correct[] = {0, 1, 2, 3, 11, 12, 13, 22, 23, 33};
-
- // lower, column_major
- // storage should be: 0 1 2 3 11 12 13 22 23 33
- int lc_correct[] = {0, 1, 2, 3, 11, 12, 13, 22, 23, 33};
-
- // lower, row_major
- // storage should be: 0 1 11 2 12 22 3 13 23 33
- int lr_correct[] = {0, 1, 11, 2, 12, 22, 3, 13, 23, 33};
+ int sz = 4;
+ ublas::symmetric_matrix<int, ublas::upper, ublas::column_major> UpCol (sz, sz);
+ ublas::symmetric_matrix<int, ublas::upper, ublas::row_major> UpRow (sz, sz);
+ ublas::symmetric_matrix<int, ublas::lower, ublas::column_major> LoCol (sz, sz);
+ ublas::symmetric_matrix<int, ublas::lower, ublas::row_major> LoRow (sz, sz);
+
+ ublas::triangular_matrix<int, ublas::upper, ublas::column_major> TrUpCol (sz, sz);
+ ublas::triangular_matrix<int, ublas::upper, ublas::row_major> TrUpRow (sz, sz);
+ ublas::triangular_matrix<int, ublas::lower, ublas::column_major> TrLoCol (sz, sz);
+ ublas::triangular_matrix<int, ublas::lower, ublas::row_major> TrLoRow (sz, sz);
+
+ for(int i=0; i<sz; ++i)
+ for(int j=i; j<sz; ++j)
+ {
+ // Symmetric
+ UpCol(i,j) = 10*i + j;
+ UpRow(i,j) = 10*i + j;
+ LoCol(i,j) = 10*i + j;
+ LoRow(i,j) = 10*i + j;
+ // Triangular
+ TrUpCol(i,j) = 10*i + j;
+ TrUpRow(i,j) = 10*i + j;
+ TrLoCol(j,i) = 10*i + j;
+ TrLoRow(j,i) = 10*i + j;
+ }
+
+ //get pointers to data
+ int* uc = &(UpCol.data()[0]);
+ int* ur = &(UpRow.data()[0]);
+ int* lc = &(LoCol.data()[0]);
+ int* lr = &(LoRow.data()[0]);
+ int* tuc = &(TrUpCol.data()[0]);
+ int* tur = &(TrUpRow.data()[0]);
+ int* tlc = &(TrLoCol.data()[0]);
+ int* tlr = &(TrLoRow.data()[0]);
+
+ // upper, column_major
+ // storage should be: 0 1 11 2 12 22 3 13 23 33
+ int uc_correct[] = {0, 1, 11, 2, 12, 22, 3, 13, 23, 33};
+
+ // upper, row_major
+ // storage should be: 0 1 2 3 11 12 13 22 23 33
+ int ur_correct[] = {0, 1, 2, 3, 11, 12, 13, 22, 23, 33};
+
+ // lower, column_major
+ // storage should be: 0 1 2 3 11 12 13 22 23 33
+ int lc_correct[] = {0, 1, 2, 3, 11, 12, 13, 22, 23, 33};
+
+ // lower, row_major
+ // storage should be: 0 1 11 2 12 22 3 13 23 33
+ int lr_correct[] = {0, 1, 11, 2, 12, 22, 3, 13, 23, 33};
bool success = true;
- // Test Symmetric
- for(int i=0; i<sz*(sz+1)/2; ++i)
- if(uc[i] != uc_correct[i])
- {
- cout << "Storage error (Symmetric, Upper, Column major)" << endl;
- success = false;
- break;
- }
-
- for(int i=0; i<sz*(sz+1)/2; ++i)
- if(ur[i] != ur_correct[i])
- {
- cout << "Storage error (Symmetric, Upper, Row major)" << endl;
- success = false;
- break;
- }
-
- for(int i=0; i<sz*(sz+1)/2; ++i)
- if(lc[i] != lc_correct[i])
- {
- cout << "Storage error (Symmetric, Lower, Column major)" << endl;
- success = false;
- break;
- }
-
- for(int i=0; i<sz*(sz+1)/2; ++i)
- if(lr[i] != lr_correct[i])
- {
- cout << "Storage error (Symmetric, Lower, Row major)" << endl;
- success = false;
- break;
- }
-
- // Test Triangular
- for(int i=0; i<sz*(sz+1)/2; ++i)
- if(tuc[i] != uc_correct[i])
- {
- cout << "Storage error (Triangular, Upper, Column major)" << endl;
- success = false;
- break;
- }
-
- for(int i=0; i<sz*(sz+1)/2; ++i)
- if(tur[i] != ur_correct[i])
- {
- cout << "Storage error (Triangular, Upper, Row major)" << endl;
- success = false;
- break;
- }
-
- for(int i=0; i<sz*(sz+1)/2; ++i)
- if(tlc[i] != lc_correct[i])
- {
- cout << "Storage error (Triangular, Lower, Column major)" << endl;
- success = false;
- break;
- }
-
- for(int i=0; i<sz*(sz+1)/2; ++i)
- if(tlr[i] != lr_correct[i])
- {
- cout << "Storage error (Triangular, Lower, Row major)" << endl;
+ // Test Symmetric
+ for(int i=0; i<sz*(sz+1)/2; ++i)
+ if(uc[i] != uc_correct[i])
+ {
+ cout << "Storage error (Symmetric, Upper, Column major)" << endl;
+ success = false;
+ break;
+ }
+
+ for(int i=0; i<sz*(sz+1)/2; ++i)
+ if(ur[i] != ur_correct[i])
+ {
+ cout << "Storage error (Symmetric, Upper, Row major)" << endl;
+ success = false;
+ break;
+ }
+
+ for(int i=0; i<sz*(sz+1)/2; ++i)
+ if(lc[i] != lc_correct[i])
+ {
+ cout << "Storage error (Symmetric, Lower, Column major)" << endl;
+ success = false;
+ break;
+ }
+
+ for(int i=0; i<sz*(sz+1)/2; ++i)
+ if(lr[i] != lr_correct[i])
+ {
+ cout << "Storage error (Symmetric, Lower, Row major)" << endl;
+ success = false;
+ break;
+ }
+
+ // Test Triangular
+ for(int i=0; i<sz*(sz+1)/2; ++i)
+ if(tuc[i] != uc_correct[i])
+ {
+ cout << "Storage error (Triangular, Upper, Column major)" << endl;
+ success = false;
+ break;
+ }
+
+ for(int i=0; i<sz*(sz+1)/2; ++i)
+ if(tur[i] != ur_correct[i])
+ {
+ cout << "Storage error (Triangular, Upper, Row major)" << endl;
+ success = false;
+ break;
+ }
+
+ for(int i=0; i<sz*(sz+1)/2; ++i)
+ if(tlc[i] != lc_correct[i])
+ {
+ cout << "Storage error (Triangular, Lower, Column major)" << endl;
+ success = false;
+ break;
+ }
+
+ for(int i=0; i<sz*(sz+1)/2; ++i)
+ if(tlr[i] != lr_correct[i])
+ {
+ cout << "Storage error (Triangular, Lower, Row major)" << endl;
success = false;
- break;
- }
+ break;
+ }
-
- return (success)?boost::exit_success:boost::exit_failure;
+
+ return (success)?boost::exit_success:boost::exit_failure;
}
Modified: trunk/libs/optional/test/optional_test_ref.cpp
==============================================================================
--- trunk/libs/optional/test/optional_test_ref.cpp (original)
+++ trunk/libs/optional/test/optional_test_ref.cpp 2009-05-20 15:19:00 EDT (Wed, 20 May 2009)
@@ -342,14 +342,14 @@
int i = 0 ;
optional<int&> ori1 = i ;
BOOST_CHECK( &(*ori1) == &i ) ;
-
+
optional<int&> ori2(i) ;
BOOST_CHECK( &(*ori2) == &i ) ;
-
+
int const ci = 0 ;
optional<int const&> orci1 = ci ;
BOOST_CHECK( &(*orci1) == &ci ) ;
-
+
optional<int const&> orci2(ci) ;
BOOST_CHECK( &(*orci2) == &ci ) ;
}
@@ -360,7 +360,7 @@
{
test_with_class_type();
test_with_builtin_types();
- test_binding();
+ test_binding();
}
catch ( ... )
{
Modified: trunk/libs/python/test/map_indexing_suite.cpp
==============================================================================
--- trunk/libs/python/test/map_indexing_suite.cpp (original)
+++ trunk/libs/python/test/map_indexing_suite.cpp 2009-05-20 15:19:00 EDT (Wed, 20 May 2009)
@@ -62,7 +62,7 @@
void a_map_indexing_suite(); // moved to a_map_indexing_suite.cpp to
a_map_indexing_suite(); // avoid MSVC 6/7 internal structure overflow
-
+
}
#include "module_tail.cpp"
Modified: trunk/libs/serialization/example/portable_binary_iarchive.hpp
==============================================================================
--- trunk/libs/serialization/example/portable_binary_iarchive.hpp (original)
+++ trunk/libs/serialization/example/portable_binary_iarchive.hpp 2009-05-20 15:19:00 EDT (Wed, 20 May 2009)
@@ -70,9 +70,9 @@
public boost::archive::detail::common_iarchive<
portable_binary_iarchive
>
- ,
+ ,
public boost::archive::detail::shared_ptr_helper
- {
+ {
typedef boost::archive::basic_binary_iprimitive<
portable_binary_iarchive,
std::istream::char_type,
Modified: trunk/libs/serialization/src/extended_type_info_typeid.cpp
==============================================================================
--- trunk/libs/serialization/src/extended_type_info_typeid.cpp (original)
+++ trunk/libs/serialization/src/extended_type_info_typeid.cpp 2009-05-20 15:19:00 EDT (Wed, 20 May 2009)
@@ -92,8 +92,8 @@
// remove entry in map which corresponds to this type
do{
if(this == *start)
- x.erase(start++);
- else
+ x.erase(start++);
+ else
++start;
}while(start != end);
}
Modified: trunk/libs/spirit/classic/example/intermediate/simple_xml/tag.hpp
==============================================================================
--- trunk/libs/spirit/classic/example/intermediate/simple_xml/tag.hpp (original)
+++ trunk/libs/spirit/classic/example/intermediate/simple_xml/tag.hpp 2009-05-20 15:19:00 EDT (Wed, 20 May 2009)
@@ -12,14 +12,14 @@
struct tag
{
- std::string id;
+ std::string id;
std::map<std::string,std::string> attributes;
typedef boost::variant<
std::string,
boost::recursive_wrapper<tag>
>
variant_type;
- std::list<variant_type> children;
+ std::list<variant_type> children;
};
Modified: trunk/libs/utility/swap/test/std_bitset.cpp
==============================================================================
--- trunk/libs/utility/swap/test/std_bitset.cpp (original)
+++ trunk/libs/utility/swap/test/std_bitset.cpp 2009-05-20 15:19:00 EDT (Wed, 20 May 2009)
@@ -19,7 +19,7 @@
typedef std::bitset<8> bitset_type;
const bitset_type initial_value1 = 1ul;
const bitset_type initial_value2 = 2ul;
-
+
bitset_type object1 = initial_value1;
bitset_type object2 = initial_value2;
Modified: trunk/libs/utility/swap/test/swap_test_class.hpp
==============================================================================
--- trunk/libs/utility/swap/test/swap_test_class.hpp (original)
+++ trunk/libs/utility/swap/test/swap_test_class.hpp 2009-05-20 15:19:00 EDT (Wed, 20 May 2009)
@@ -12,7 +12,7 @@
class swap_test_class
{
- int m_data;
+ int m_data;
public:
explicit swap_test_class(int arg = 0)
:
Modified: trunk/tools/regression/src/library_status.cpp
==============================================================================
--- trunk/tools/regression/src/library_status.cpp (original)
+++ trunk/tools/regression/src/library_status.cpp 2009-05-20 15:19:00 EDT (Wed, 20 May 2009)
@@ -111,7 +111,7 @@
for(itr = m_subcolumns.begin(); itr != m_subcolumns.end(); ++itr){
std::pair<int, int> spans;
spans = itr->second.get_spans();
- rows = std::max(rows, spans.first);
+ rows = (std::max)(rows, spans.first);
cols += spans.second;
}
++rows;
@@ -661,7 +661,7 @@
col_node::subcolumns_t::const_iterator itr;
int max_depth = 1;
for(itr = root.m_subcolumns.begin(); itr != root.m_subcolumns.end(); ++itr){
- max_depth = std::max(max_depth, itr->second.rows);
+ max_depth = (std::max)(max_depth, itr->second.rows);
}
return max_depth;
}
@@ -856,9 +856,9 @@
" options: --compiler name Run for named compiler only\n"
" --ignore-pass Do not report tests which pass all compilers\n"
" --no-warn Warnings not reported if test passes\n"
- " --boost-root path default derived from current path.\n"
- " --locate-root path Path to ALL_LOCATE_TARGET for bjam;\n"
- " default boost-root.\n"
+ " --boost-root path default derived from current path.\n"
+ " --locate-root path Path to ALL_LOCATE_TARGET for bjam;\n"
+ " default boost-root.\n"
" --comment path Path to file containing HTML\n"
" to be copied into status-file.\n"
" --notes path Path to file containing HTML\n"
@@ -873,10 +873,10 @@
return 1;
}
- if(boost_root.empty())
- boost_root = find_boost_root();
- if ( locate_root.empty() )
- locate_root = boost_root;
+ if(boost_root.empty())
+ boost_root = find_boost_root();
+ if ( locate_root.empty() )
+ locate_root = boost_root;
report.open( fs::path( argv[1], fs::native ) );
if ( !report )