? bin
? bin.v2
? child.zip
? glob.zip
? random.diff
? stage
? boost/child
? boost/child_v1
? boost/glob
? libs/child
? libs/child_v1
? libs/glob
Index: boost/random/lagged_fibonacci.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/random/lagged_fibonacci.hpp,v
retrieving revision 1.28
diff -u -p -r1.28 lagged_fibonacci.hpp
--- boost/random/lagged_fibonacci.hpp	21 May 2005 15:57:00 -0000	1.28
+++ boost/random/lagged_fibonacci.hpp	14 Oct 2005 08:26:47 -0000
@@ -32,7 +32,7 @@
 namespace boost {
 namespace random {
 
-#if BOOST_WORKAROUND(_MSC_FULL_VER, BOOST_TESTED_AT(13102292)) && BOOST_MSVC > 1300
+#if defined(_MSC_FULL_VER) && BOOST_WORKAROUND(_MSC_FULL_VER, BOOST_TESTED_AT(13102292)) && BOOST_MSVC > 1300
 #  define BOOST_RANDOM_EXTRACT_LF
 #endif
 
Index: boost/random/linear_congruential.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/random/linear_congruential.hpp,v
retrieving revision 1.22
diff -u -p -r1.22 linear_congruential.hpp
--- boost/random/linear_congruential.hpp	21 May 2005 15:57:00 -0000	1.22
+++ boost/random/linear_congruential.hpp	14 Oct 2005 08:26:47 -0000
@@ -110,7 +110,8 @@ public:
                          const linear_congruential& y)
   { return !(x == y); }
     
-#if !defined(BOOST_NO_MEMBER_TEMPLATE_FRIENDS) && !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x551))
+#if !defined(BOOST_NO_MEMBER_TEMPLATE_FRIENDS) && \
+    !(defined(__BORLANDC__) && BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x551)))
   template<class CharT, class Traits>
   friend std::basic_ostream<CharT,Traits>&
   operator<<(std::basic_ostream<CharT,Traits>& os,
@@ -136,7 +137,7 @@ private:
 };
 
 // probably needs the "no native streams" caveat for STLPort
-#if !defined(__SGI_STL_PORT) && BOOST_WORKAROUND(__GNUC__, == 2)
+#if !defined(__SGI_STL_PORT) && defined(__GNUC__) && BOOST_WORKAROUND(__GNUC__, == 2)
 template<class IntType, IntType a, IntType c, IntType m, IntType val>
 std::ostream&
 operator<<(std::ostream& os,
@@ -152,7 +153,7 @@ operator>>(std::istream& is,
 {
     return is >> lcg._x;
 }
-#elif defined(BOOST_NO_OPERATORS_IN_NAMESPACE) || defined(BOOST_NO_MEMBER_TEMPLATE_FRIENDS) || BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x551))
+#elif defined(BOOST_NO_OPERATORS_IN_NAMESPACE) || defined(BOOST_NO_MEMBER_TEMPLATE_FRIENDS) || (defined(__BORLANDC__) && BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x551)))
 template<class CharT, class Traits, class IntType, IntType a, IntType c, IntType m, IntType val>
 std::basic_ostream<CharT,Traits>&
 operator<<(std::basic_ostream<CharT,Traits>& os,
Index: boost/random/subtract_with_carry.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/random/subtract_with_carry.hpp,v
retrieving revision 1.24
diff -u -p -r1.24 subtract_with_carry.hpp
--- boost/random/subtract_with_carry.hpp	21 May 2005 15:57:00 -0000	1.24
+++ boost/random/subtract_with_carry.hpp	14 Oct 2005 08:26:47 -0000
@@ -32,7 +32,7 @@
 namespace boost {
 namespace random {
 
-#if BOOST_WORKAROUND(_MSC_FULL_VER, BOOST_TESTED_AT(13102292)) && BOOST_MSVC > 1300
+#if defined(_MSC_FULL_VER) && BOOST_WORKAROUND(_MSC_FULL_VER, BOOST_TESTED_AT(13102292)) && BOOST_MSVC > 1300
 #  define BOOST_RANDOM_EXTRACT_SWC_01
 #endif
 
Index: boost/random/uniform_int.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/random/uniform_int.hpp,v
retrieving revision 1.27
diff -u -p -r1.27 uniform_int.hpp
--- boost/random/uniform_int.hpp	27 Jul 2004 03:43:32 -0000	1.27
+++ boost/random/uniform_int.hpp	14 Oct 2005 08:26:48 -0000
@@ -128,7 +128,7 @@ public:
   friend std::basic_istream<CharT,Traits>&
   operator>>(std::basic_istream<CharT,Traits>& is, uniform_int& ud)
   {
-# if BOOST_WORKAROUND(_MSC_FULL_VER, BOOST_TESTED_AT(13102292)) && BOOST_MSVC > 1300
+# if defined(_MSC_FULL_VER) && BOOST_WORKAROUND(_MSC_FULL_VER, BOOST_TESTED_AT(13102292)) && BOOST_MSVC > 1300
       return detail::extract_uniform_int(is, ud, ud.impl);
 # else
    is >> std::ws >> ud._min >> std::ws >> ud._max;
Index: boost/random/uniform_smallint.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/random/uniform_smallint.hpp,v
retrieving revision 1.29
diff -u -p -r1.29 uniform_smallint.hpp
--- boost/random/uniform_smallint.hpp	27 Jul 2004 03:43:32 -0000	1.29
+++ boost/random/uniform_smallint.hpp	14 Oct 2005 08:26:48 -0000
@@ -217,7 +217,7 @@ public:
   friend std::basic_istream<CharT,Traits>&
   operator>>(std::basic_istream<CharT,Traits>& is, uniform_smallint& ud)
   {
-# if BOOST_WORKAROUND(_MSC_FULL_VER, BOOST_TESTED_AT(13102292)) && BOOST_MSVC > 1300
+# if defined(_MSC_FULL_VER) && BOOST_WORKAROUND(_MSC_FULL_VER, BOOST_TESTED_AT(13102292)) && BOOST_MSVC > 1300
       return detail::extract_uniform_int(is, ud, ud._impl);
 # else
     is >> std::ws >> ud._min >> std::ws >> ud._max;
Index: boost/random/variate_generator.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/random/variate_generator.hpp,v
retrieving revision 1.8
diff -u -p -r1.8 variate_generator.hpp
--- boost/random/variate_generator.hpp	14 Feb 2005 11:53:50 -0000	1.8
+++ boost/random/variate_generator.hpp	14 Oct 2005 08:26:48 -0000
@@ -25,7 +25,7 @@
 
 // Borland C++ 5.6.0 has problems using its numeric_limits traits as
 // template parameters
-#if BOOST_WORKAROUND(__BORLANDC__, <= 0x564)
+#if defined(__BORLANDC__) && BOOST_WORKAROUND(__BORLANDC__, <= 0x564)
 #include <boost/type_traits/is_integral.hpp>
 #endif
 
@@ -111,7 +111,7 @@ public:
   result_type max BOOST_PREVENT_MACRO_SUBSTITUTION () const { return (distribution().max)(); }
 
 private:
-#if BOOST_WORKAROUND(__BORLANDC__, <= 0x564)
+#if defined (__BORLANDC__) && BOOST_WORKAROUND(__BORLANDC__, <= 0x564)
   typedef typename random::detail::engine_helper<
     boost::is_integral<typename decorated_engine::result_type>::value,
     boost::is_integral<typename Distribution::input_type>::value
Index: boost/random/detail/const_mod.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/random/detail/const_mod.hpp,v
retrieving revision 1.8
diff -u -p -r1.8 const_mod.hpp
--- boost/random/detail/const_mod.hpp	27 Jul 2004 03:43:32 -0000	1.8
+++ boost/random/detail/const_mod.hpp	14 Oct 2005 08:26:48 -0000
@@ -146,7 +146,7 @@ private:
   {
     // we are interested in the gcd factor for c, because this is our inverse
     BOOST_STATIC_ASSERT(m > 0);
-#if BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3003))
+#if defined(__MWERKS__) && BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3003))
     assert(boost::integer_traits<IntType>::is_signed);
 #elif !defined(BOOST_NO_LIMITS_COMPILE_TIME_CONSTANTS)
     BOOST_STATIC_ASSERT(boost::integer_traits<IntType>::is_signed);