Fix compilation of Boost.Range adaptors on GCC 64-bit

[SVN r60904]

include/boost/range/adaptor/copied.hpp

@@ -18,38 +18,28 @@
 
 namespace boost
 {
-	namespace range_detail
-	{
-		template< class T >
-		struct copy_holder
-			: holder2<std::size_t>
-		{
-			copy_holder( std::size_t t, std::size_t u )
-			    : holder2<std::size_t>(t,u)
-			{ }
-		};
-
-	} // 'range_detail'
-
 	namespace adaptors
 	{
-		template< class CopyableRandomAccessRng, class Int >
+	    struct copied
+	    {
+	        copied(std::size_t t_, std::size_t u_)
+                : t(t_), u(u_) {}
+
+            std::size_t t;
+            std::size_t u;
+	    };
+
+		template< class CopyableRandomAccessRng >
 		inline CopyableRandomAccessRng
-		operator|( const CopyableRandomAccessRng& r, const range_detail::copy_holder<Int>& f )
+		operator|( const CopyableRandomAccessRng& r, const copied& f )
 		{
 			iterator_range<
 				BOOST_DEDUCED_TYPENAME range_iterator<const
 				                               CopyableRandomAccessRng>::type >
-			temp( range_detail::sliced_impl( r, f ) );
+			temp( adaptors::slice( r, f.t, f.u ) );
 			return CopyableRandomAccessRng( temp.begin(), temp.end() );
 		}
 
-		namespace
-		{
-			const range_detail::forwarder2<range_detail::copy_holder>
-  	           copied = range_detail::forwarder2<range_detail::copy_holder>();
-		}
-
 		template<class CopyableRandomAccessRange>
 		inline CopyableRandomAccessRange
 		copy(const CopyableRandomAccessRange& rng, std::size_t t, std::size_t u)

include/boost/range/adaptor/indexed.hpp

@@ -27,6 +27,14 @@
 
 namespace boost
 {
+    namespace adaptors
+    {
+        struct indexed
+        {
+            explicit indexed(std::size_t x) : val(x) {}
+            std::size_t val;
+        };
+    }
 
 	namespace range_detail
 	{
@@ -95,44 +103,6 @@ namespace boost
             { }
         };
 
-
-        template< class T >
-        struct index_holder : holder<T>
-        {
-            index_holder( T r ) : holder<T>(r)
-            { }
-        };
-
-        struct index_forwarder
-        {
-            template< class T >
-            index_holder<T> operator()( T r ) const
-            {
-                return r;
-            }
-            
-            index_holder<int> operator()( int r = 0 ) const
-            {
-                return r;
-            }
-        };
-        
-		template< class SinglePassRange >
-		inline indexed_range<SinglePassRange> 
-		operator|( SinglePassRange& r, 
-				   const index_holder<typename range_difference<SinglePassRange>::type>& f )
-		{
-			return indexed_range<SinglePassRange>( f.val, r ); 
-		}
-	
-		template< class SinglePassRange >
-		inline indexed_range<const SinglePassRange> 
-		operator|( const SinglePassRange& r, 
-				   const index_holder<typename range_difference<SinglePassRange>::type>& f )
-		{
-			return indexed_range<const SinglePassRange>( f.val, r );   
-		}
-		
 	} // 'range_detail'
 
 	// Make this available to users of this library. It will sometimes be
@@ -142,11 +112,20 @@ namespace boost
 
 	namespace adaptors
 	{
-		namespace
+        template< class SinglePassRange >
+		inline indexed_range<SinglePassRange>
+		operator|( SinglePassRange& r,
+				   const indexed& f )
 		{
-			const range_detail::forwarder<range_detail::index_holder> 
+			return indexed_range<SinglePassRange>( f.val, r );
-				   indexed = 
+		}
-				       range_detail::forwarder<range_detail::index_holder>();
+
+		template< class SinglePassRange >
+		inline indexed_range<const SinglePassRange>
+		operator|( const SinglePassRange& r,
+				   const indexed& f )
+		{
+			return indexed_range<const SinglePassRange>( f.val, r );
 		}
 
 		template<class SinglePassRange, class Index>

include/boost/range/adaptor/sliced.hpp

@@ -19,6 +19,14 @@ namespace boost
 {
     namespace adaptors
     {
+        struct sliced
+        {
+            sliced(std::size_t t_, std::size_t u_)
+                : t(t_), u(u_) {}
+            std::size_t t;
+            std::size_t u;
+        };
+
 		template< class RandomAccessRange >
 		inline iterator_range< BOOST_DEDUCED_TYPENAME range_iterator<RandomAccessRange>::type >
 		slice( RandomAccessRange& rng, std::size_t t, std::size_t u )
@@ -27,7 +35,7 @@ namespace boost
             BOOST_ASSERT( static_cast<std::size_t>(boost::size(rng)) >= u &&
 						  "second slice index out of bounds" );
 
-			return make_iterator_range( rng, t, u - boost::size(rng) ); 
+			return boost::make_iterator_range( rng, t, u - boost::size(rng) );
 		}
 
 		template< class RandomAccessRange >
@@ -38,55 +46,26 @@ namespace boost
 		    BOOST_ASSERT( static_cast<std::size_t>(boost::size(rng)) >= u &&
 		                  "second slice index out of bounds" );
 
-            return make_iterator_range( rng, t, u - boost::size(rng) );
+            return boost::make_iterator_range( rng, t, u - boost::size(rng) );
-		}
-    } // 'adaptors'
-    
-	namespace range_detail
-	{
-		template< class T >
-		struct slice_holder 
-			: holder2<std::size_t> 
-		{
-			slice_holder( std::size_t t, std::size_t u ) 
-			    : holder2<std::size_t>(t,u)
-			{ }
-		};
-		
-		template<class R, class H>
-		inline iterator_range< BOOST_DEDUCED_TYPENAME range_iterator<R>::type >
-		sliced_impl( R& r, const H& f)
-		{
-		    return adaptors::slice(r, f.val1, f.val2);
 		}
 
-		template< class RandomAccessRange, class Int >
+		template< class RandomAccessRange >
 		inline iterator_range<
 			     BOOST_DEDUCED_TYPENAME range_iterator<RandomAccessRange>::type >
-		operator|( RandomAccessRange& r, const slice_holder<Int>& f )
+		operator|( RandomAccessRange& r, const sliced& f )
 		{
-			return sliced_impl( r, f );
+			return adaptors::slice( r, f.t, f.u );
 		}
 
-		template< class RandomAccessRange, class Int >
+		template< class RandomAccessRange >
 		inline iterator_range<
 				 BOOST_DEDUCED_TYPENAME range_iterator<const RandomAccessRange>::type >
-		operator|( const RandomAccessRange& r, const slice_holder<Int>& f )
+		operator|( const RandomAccessRange& r, const sliced& f )
 		{
-			return sliced_impl( r, f );
+			return adaptors::slice( r, f.t, f.u );
 		}
 
-	} // 'range_detail'
+    } // namespace adaptors
-
+} // namespace boost
-	namespace adaptors
-	{ 
-		namespace
-		{
-			const range_detail::forwarder2<range_detail::slice_holder> 
-  	           sliced = range_detail::forwarder2<range_detail::slice_holder>();
-		}
-	}
-	
-}
 
 #endif