From c1aea25e4486d6348d0b6e460bc038e57ad090cc Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Fri, 7 Dec 2007 01:12:02 +0000
Subject: [PATCH] Merge from trunk, finally.

[SVN r41817]
---
 include/boost/range/detail/sizer.hpp | 6 ++----
 include/boost/range/sub_range.hpp    | 2 ++
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/boost/range/detail/sizer.hpp b/include/boost/range/detail/sizer.hpp
index 5d75437..b4c1c91 100755
--- a/include/boost/range/detail/sizer.hpp
+++ b/include/boost/range/detail/sizer.hpp
@@ -25,12 +25,10 @@ namespace boost
     //////////////////////////////////////////////////////////////////////
     
     template< typename T, std::size_t sz >
-    char&
-    sizer( const T BOOST_RANGE_ARRAY_REF()[sz] )[sz];
+    char (& sizer( const T BOOST_RANGE_ARRAY_REF()[sz] ) )[sz];
     
     template< typename T, std::size_t sz >
-    char&
-    sizer( T BOOST_RANGE_ARRAY_REF()[sz] )[sz];
+    char (& sizer( T BOOST_RANGE_ARRAY_REF()[sz] ) )[sz];
 
 } // namespace 'boost'
 
diff --git a/include/boost/range/sub_range.hpp b/include/boost/range/sub_range.hpp
index 802454b..35dfb27 100755
--- a/include/boost/range/sub_range.hpp
+++ b/include/boost/range/sub_range.hpp
@@ -11,6 +11,8 @@
 #ifndef BOOST_RANGE_SUB_RANGE_HPP
 #define BOOST_RANGE_SUB_RANGE_HPP
 
+#include <boost/detail/workaround.hpp>
+
 #if BOOST_WORKAROUND(BOOST_MSVC, == 1310) || BOOST_WORKAROUND(BOOST_MSVC, == 1400) 
     #pragma warning( disable : 4996 )
 #endif