[Boost-commit] svn:boost r57265 - sandbox/itl/boost/itl_xt

Subject: [Boost-commit] svn:boost r57265 - sandbox/itl/boost/itl_xt
From: afojgo_at_[hidden]
Date: 2009-10-31 18:52:16

Author: jofaber
Date: 2009-10-31 18:52:16 EDT (Sat, 31 Oct 2009)
New Revision: 57265
URL: http://svn.boost.org/trac/boost/changeset/57265

Log:
Portability adjustments for gcc.
Text files modified: 
   sandbox/itl/boost/itl_xt/bits.hpp            |    32 ++++++++++++++++----------------        
   sandbox/itl/boost/itl_xt/interval_bitset.hpp |     4 ++--                                    
   2 files changed, 18 insertions(+), 18 deletions(-)

Modified: sandbox/itl/boost/itl_xt/bits.hpp
==============================================================================
--- sandbox/itl/boost/itl_xt/bits.hpp	(original)
+++ sandbox/itl/boost/itl_xt/bits.hpp	2009-10-31 18:52:16 EDT (Sat, 31 Oct 2009)
@@ -114,7 +114,7 @@
     if(0 ==(left.word() & right.word())) return inclusion::unrelated;
     else if(left.word() < right.word() ) return inclusion::subset;
     else if(left.word() > right.word() ) return inclusion::superset;
-    else                                     return inclusion::equal;
+    else                                 return inclusion::equal;
 }
 
 
@@ -179,21 +179,21 @@
 
 };
 
-template<>
-struct count<unsigned int, 32>
-{
-	typedef unsigned int            word_type;
-	typedef count<word_type,32> type;
-
-	static bit_range_type apply(word_type value)
-	{ 
-		return table[ value        & 0xfful]
-			 + table[(value >>  8) & 0xfful]
-			 + table[(value >> 16) & 0xfful]
-			 + table[(value >> 24) & 0xfful];
-	}
-
-};
+//template<>
+//struct count<unsigned int, 32>
+//{
+//	typedef unsigned int            word_type;
+//	typedef count<word_type,32> type;
+//
+//	static bit_range_type apply(word_type value)
+//	{ 
+//		return table[ value        & 0xfful]
+//			 + table[(value >>  8) & 0xfful]
+//			 + table[(value >> 16) & 0xfful]
+//			 + table[(value >> 24) & 0xfful];
+//	}
+//
+//};
 
 template<>
 struct count<nat64, 64>

Modified: sandbox/itl/boost/itl_xt/interval_bitset.hpp
==============================================================================
--- sandbox/itl/boost/itl_xt/interval_bitset.hpp	(original)
+++ sandbox/itl/boost/itl_xt/interval_bitset.hpp	2009-10-31 18:52:16 EDT (Sat, 31 Oct 2009)
@@ -117,7 +117,7 @@
         size_type interval_count()const { return _map.interval_count(); }
         size_type iterative_size()const { return _map.iterative_size(); }
 
-	bool contains(element_type element)const{_map(element>>shift).contains(element & mask);}
+	bool contains(element_type element)const{ return _map(element>>shift).contains(element & mask); }
         bool contains(const segment_type& segment)const;
         bool contains(const interval_bitset& sub)const      { return _map.contains(sub._map); }
         bool contained_in(const interval_bitset& super)const{ return _map.contained_in(super._map); }
@@ -295,7 +295,7 @@
 }
 
 template<class DomainT,	class BitSetT, ITL_COMPARE Compare, template<class, ITL_COMPARE>class Interval, ITL_ALLOC Alloc> 
-void interval_bitset<DomainT,BitSetT,Compare,Interval,Alloc>::show_matrix(const char off_on[2] = " 1")const
+void interval_bitset<DomainT,BitSetT,Compare,Interval,Alloc>::show_matrix(const char off_on[2])const
 {
     typename interval_bitmap_type::const_iterator iter = _map.begin();
     while(iter != _map.end())