[Boost-commit] svn:boost r78340 - in branches/release: . boost boost/random boost/random/detail libs libs/random/test

Subject: [Boost-commit] svn:boost r78340 - in branches/release: . boost boost/random boost/random/detail libs libs/random/test
From: steven_at_[hidden]
Date: 2012-05-05 17:14:38

Author: steven_watanabe
Date: 2012-05-05 17:14:37 EDT (Sat, 05 May 2012)
New Revision: 78340
URL: http://svn.boost.org/trac/boost/changeset/78340

Log:
Merge Random from the trunk.
Properties modified: 
   branches/release/   (props changed)
   branches/release/boost/   (props changed)
   branches/release/libs/   (props changed)
Text files modified: 
   branches/release/boost/random/detail/signed_unsigned_tools.hpp             |     2 +-                                      
   branches/release/boost/random/discrete_distribution.hpp                    |     6 +++---                                  
   branches/release/boost/random/piecewise_constant_distribution.hpp          |     6 +++---                                  
   branches/release/boost/random/piecewise_linear_distribution.hpp            |     6 +++---                                  
   branches/release/boost/random/seed_seq.hpp                                 |     4 ++--                                    
   branches/release/libs/random/test/test_discrete_distribution.cpp           |     4 ++--                                    
   branches/release/libs/random/test/test_piecewise_constant_distribution.cpp |     4 ++--                                    
   branches/release/libs/random/test/test_piecewise_linear_distribution.cpp   |     4 ++--                                    
   branches/release/libs/random/test/test_seed_seq.cpp                        |     2 +-                                      
   9 files changed, 19 insertions(+), 19 deletions(-)

Modified: branches/release/boost/random/detail/signed_unsigned_tools.hpp
==============================================================================
--- branches/release/boost/random/detail/signed_unsigned_tools.hpp	(original)
+++ branches/release/boost/random/detail/signed_unsigned_tools.hpp	2012-05-05 17:14:37 EDT (Sat, 05 May 2012)
@@ -73,7 +73,7 @@
     if (y >= 0)
       return T2(x) + y;
     // y < 0
-    if (x >= T1(-(y+1)))  // result >= 0 after subtraction
+    if (x > T1(-(y+1)))  // result >= 0 after subtraction
       // avoid the nasty two's complement edge case for y == min()
       return T2(x - T1(-(y+1)) - 1);
     // abs(x) < abs(y), thus T2 able to represent x

Modified: branches/release/boost/random/discrete_distribution.hpp
==============================================================================
--- branches/release/boost/random/discrete_distribution.hpp	(original)
+++ branches/release/boost/random/discrete_distribution.hpp	2012-05-05 17:14:37 EDT (Sat, 05 May 2012)
@@ -25,7 +25,7 @@
 #include <boost/random/detail/operators.hpp>
 #include <boost/random/detail/vector_io.hpp>
 
-#ifndef BOOST_NO_INITIALIZER_LISTS
+#ifndef BOOST_NO_0X_HDR_INITIALIZER_LIST
 #include <initializer_list>
 #endif
 
@@ -69,7 +69,7 @@
         {
             normalize();
         }
-#ifndef BOOST_NO_INITIALIZER_LISTS
+#ifndef BOOST_NO_0X_HDR_INITIALIZER_LIST
         /**
          * If wl.size() == 0, equivalent to the default constructor.
          * Otherwise, the values of the @c initializer_list represent
@@ -190,7 +190,7 @@
     {
         init(first, last);
     }
-#ifndef BOOST_NO_INITIALIZER_LISTS
+#ifndef BOOST_NO_0X_HDR_INITIALIZER_LIST
     /**
      * Constructs a @c discrete_distribution from a @c std::initializer_list.
      * If the @c initializer_list is empty, equivalent to the default

Modified: branches/release/boost/random/piecewise_constant_distribution.hpp
==============================================================================
--- branches/release/boost/random/piecewise_constant_distribution.hpp	(original)
+++ branches/release/boost/random/piecewise_constant_distribution.hpp	2012-05-05 17:14:37 EDT (Sat, 05 May 2012)
@@ -22,7 +22,7 @@
 #include <boost/random/detail/operators.hpp>
 #include <boost/random/detail/vector_io.hpp>
 
-#ifndef BOOST_NO_INITIALIZER_LISTS
+#ifndef BOOST_NO_0X_HDR_INITIALIZER_LIST
 #include <initializer_list>
 #endif
 
@@ -84,7 +84,7 @@
                 }
             }
         }
-#ifndef BOOST_NO_INITIALIZER_LISTS
+#ifndef BOOST_NO_0X_HDR_INITIALIZER_LIST
         /**
          * Constructs a @c param_type object from an
          * initializer_list containing the interval boundaries
@@ -271,7 +271,7 @@
             _bins.param(bins_param);
         }
     }
-#ifndef BOOST_NO_INITIALIZER_LISTS
+#ifndef BOOST_NO_0X_HDR_INITIALIZER_LIST
     /**
      * Constructs a piecewise_constant_distribution from an
      * initializer_list containing the interval boundaries

Modified: branches/release/boost/random/piecewise_linear_distribution.hpp
==============================================================================
--- branches/release/boost/random/piecewise_linear_distribution.hpp	(original)
+++ branches/release/boost/random/piecewise_linear_distribution.hpp	2012-05-05 17:14:37 EDT (Sat, 05 May 2012)
@@ -24,7 +24,7 @@
 #include <boost/random/detail/operators.hpp>
 #include <boost/random/detail/vector_io.hpp>
 
-#ifndef BOOST_NO_INITIALIZER_LISTS
+#ifndef BOOST_NO_0X_HDR_INITIALIZER_LIST
 #include <initializer_list>
 #endif
 
@@ -89,7 +89,7 @@
                 }
             }
         }
-#ifndef BOOST_NO_INITIALIZER_LISTS
+#ifndef BOOST_NO_0X_HDR_INITIALIZER_LIST
         /**
          * Constructs a @c param_type object from an initializer_list
          * containing the interval boundaries and a unary function
@@ -278,7 +278,7 @@
             init();
         }
     }
-#ifndef BOOST_NO_INITIALIZER_LISTS
+#ifndef BOOST_NO_0X_HDR_INITIALIZER_LIST
     /**
      * Constructs a piecewise_linear_distribution from an
      * initializer_list containing the interval boundaries

Modified: branches/release/boost/random/seed_seq.hpp
==============================================================================
--- branches/release/boost/random/seed_seq.hpp	(original)
+++ branches/release/boost/random/seed_seq.hpp	2012-05-05 17:14:37 EDT (Sat, 05 May 2012)
@@ -23,7 +23,7 @@
 #include <algorithm>
 #include <iterator>
 
-#ifndef BOOST_NO_INITIALIZER_LISTS
+#ifndef BOOST_NO_0X_HDR_INITIALIZER_LIST
 #include <initializer_list>
 #endif
 
@@ -42,7 +42,7 @@
 
     /** Initializes a seed_seq to hold an empty sequence. */
     seed_seq() {}
-#ifndef BOOST_NO_INITIALIZER_LISTS
+#ifndef BOOST_NO_0X_HDR_INITIALIZER_LIST
     /** Initializes the sequence from an initializer_list. */
     template<class T>
     seed_seq(const std::initializer_list<T>& il) : v(il.begin(), il.end()) {}

Modified: branches/release/libs/random/test/test_discrete_distribution.cpp
==============================================================================
--- branches/release/libs/random/test/test_discrete_distribution.cpp	(original)
+++ branches/release/libs/random/test/test_discrete_distribution.cpp	2012-05-05 17:14:37 EDT (Sat, 05 May 2012)
@@ -49,7 +49,7 @@
     boost::random::discrete_distribution<> dist;
     CHECK_PROBABILITIES(dist.probabilities(), list_of(1.0));
 
-#ifndef BOOST_NO_INITIALIZER_LISTS
+#ifndef BOOST_NO_0X_HDR_INITIALIZER_LIST
     boost::random::discrete_distribution<> dist_il = { 1, 2, 1, 4 };
     CHECK_PROBABILITIES(dist_il.probabilities(), list_of(.125)(.25)(.125)(.5));
 #endif
@@ -98,7 +98,7 @@
     BOOST_CHECK(param != param_default);
     BOOST_CHECK(!(param == param_default));
     
-#ifndef BOOST_NO_INITIALIZER_LISTS
+#ifndef BOOST_NO_0X_HDR_INITIALIZER_LIST
     boost::random::discrete_distribution<>::param_type
         parm_il = { 1, 2, 1, 4 };
     CHECK_PROBABILITIES(parm_il.probabilities(), list_of(.125)(.25)(.125)(.5));

Modified: branches/release/libs/random/test/test_piecewise_constant_distribution.cpp
==============================================================================
--- branches/release/libs/random/test/test_piecewise_constant_distribution.cpp	(original)
+++ branches/release/libs/random/test/test_piecewise_constant_distribution.cpp	2012-05-05 17:14:37 EDT (Sat, 05 May 2012)
@@ -50,7 +50,7 @@
     CHECK_SEQUENCE(dist.densities(), list_of(1.0));
     CHECK_SEQUENCE(dist.intervals(), list_of(0.0)(1.0));
 
-#ifndef BOOST_NO_INITIALIZER_LISTS
+#ifndef BOOST_NO_0X_HDR_INITIALIZER_LIST
     boost::random::piecewise_constant_distribution<> dist_il = {
         { 99, 103, 107, 111, 115 },
         gen()
@@ -139,7 +139,7 @@
     BOOST_CHECK(param != param_default);
     BOOST_CHECK(!(param == param_default));
     
-#ifndef BOOST_NO_INITIALIZER_LISTS
+#ifndef BOOST_NO_0X_HDR_INITIALIZER_LIST
     boost::random::piecewise_constant_distribution<>::param_type parm_il = {
         { 99, 103, 107, 111, 115 },
         gen()

Modified: branches/release/libs/random/test/test_piecewise_linear_distribution.cpp
==============================================================================
--- branches/release/libs/random/test/test_piecewise_linear_distribution.cpp	(original)
+++ branches/release/libs/random/test/test_piecewise_linear_distribution.cpp	2012-05-05 17:14:37 EDT (Sat, 05 May 2012)
@@ -51,7 +51,7 @@
     CHECK_SEQUENCE(dist.intervals(), list_of(0.0)(1.0));
     CHECK_SEQUENCE(dist.densities(), list_of(1.0)(1.0));
 
-#ifndef BOOST_NO_INITIALIZER_LISTS
+#ifndef BOOST_NO_0X_HDR_INITIALIZER_LIST
     boost::random::piecewise_linear_distribution<> dist_il = {
         { 99, 103, 107, 111, 115 },
         gen()
@@ -143,7 +143,7 @@
     BOOST_CHECK(param != param_default);
     BOOST_CHECK(!(param == param_default));
     
-#ifndef BOOST_NO_INITIALIZER_LISTS
+#ifndef BOOST_NO_0X_HDR_INITIALIZER_LIST
     boost::random::piecewise_linear_distribution<>::param_type parm_il = {
         { 99, 103, 107, 111, 115 },
         gen()

Modified: branches/release/libs/random/test/test_seed_seq.cpp
==============================================================================
--- branches/release/libs/random/test/test_seed_seq.cpp	(original)
+++ branches/release/libs/random/test/test_seed_seq.cpp	2012-05-05 17:14:37 EDT (Sat, 05 May 2012)
@@ -94,7 +94,7 @@
     BOOST_CHECK_EQUAL_COLLECTIONS(
         &param[0], &param[0] + 4, &expected_param[0], &expected_param[0] + 4);
     
-#ifndef BOOST_NO_INITIALIZER_LISTS
+#ifndef BOOST_NO_0X_HDR_INITIALIZER_LIST
     std::fill_n(&store32[0], 10, 0);
     std::fill_n(&store64[0], 10, 0);
     std::fill_n(&param[0], 3, 0);