[Boost-commit] svn:boost r55409 - in sandbox/itl/boost/itl: . type_traits

Subject: [Boost-commit] svn:boost r55409 - in sandbox/itl/boost/itl: . type_traits
From: afojgo_at_[hidden]
Date: 2009-08-04 17:13:20

Author: jofaber
Date: 2009-08-04 17:13:20 EDT (Tue, 04 Aug 2009)
New Revision: 55409
URL: http://svn.boost.org/trac/boost/changeset/55409

Log:
Portability: Adjustments for gcc. Stable {msvc-9.0 r+d, gcc-3.4.4}
Text files modified: 
   sandbox/itl/boost/itl/functions.hpp                 |     2 +-                                      
   sandbox/itl/boost/itl/type_traits/is_combinable.hpp |    20 +++++++++++---------                    
   2 files changed, 12 insertions(+), 10 deletions(-)

Modified: sandbox/itl/boost/itl/functions.hpp
==============================================================================
--- sandbox/itl/boost/itl/functions.hpp	(original)
+++ sandbox/itl/boost/itl/functions.hpp	2009-08-04 17:13:20 EDT (Tue, 04 Aug 2009)
@@ -338,7 +338,7 @@
         LeftT intersection;
 
         if(left.empty() || right.empty())
-		false;
+		return false;
 
         typename RightT::const_iterator  right_common_lower_;
     typename RightT::const_iterator right_common_upper_;

Modified: sandbox/itl/boost/itl/type_traits/is_combinable.hpp
==============================================================================
--- sandbox/itl/boost/itl/type_traits/is_combinable.hpp	(original)
+++ sandbox/itl/boost/itl/type_traits/is_combinable.hpp	2009-08-04 17:13:20 EDT (Tue, 04 Aug 2009)
@@ -56,25 +56,27 @@
 {
         typedef is_codomain_equal<LeftT, RightT> type;
         static const bool value =
-		is_same<LeftT::codomain_type, RightT::codomain_type>::value;
+		is_same<typename LeftT::codomain_type, 
+			    typename RightT::codomain_type>::value;
 };
 
+//NOTE: Equality of compare order implies the equality of the domain_types
 template<class LeftT, class RightT>
-struct is_content_type_equal
+struct is_domain_compare_equal
 {
-	typedef is_content_type_equal<LeftT, RightT> type;
+	typedef is_domain_compare_equal<LeftT, RightT> type;
         static const bool value =
-		mpl::and_<is_domain_compare_equal<LeftT, RightT>, 
-		          is_codomain_equal<LeftT, RightT> >::value;//JODO
+		is_same<typename LeftT::domain_compare, 
+		        typename RightT::domain_compare>::value;
 };
 
-//NOTE: Equality of compare order implies the equality of the domain_types
 template<class LeftT, class RightT>
-struct is_domain_compare_equal
+struct is_content_type_equal
 {
-	typedef is_domain_compare_equal<LeftT, RightT> type;
+	typedef is_content_type_equal<LeftT, RightT> type;
         static const bool value =
-		is_same<LeftT::domain_compare, RightT::domain_compare>::value;
+		mpl::and_<is_domain_compare_equal<LeftT, RightT>, 
+		          is_codomain_equal<LeftT, RightT> >::value;//JODO
 };