From a110ea93045b88c6d2744f49b704898b6e595311 Mon Sep 17 00:00:00 2001
From: Hartmut Kaiser <hartmut.kaiser@gmail.com>
Date: Mon, 5 Oct 2009 22:00:09 +0000
Subject: [PATCH] Fixing mismatch of default parameter values

[SVN r56607]
---
 .../fusion/view/nview/detail/nview_impl.hpp   | 20 ++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/include/boost/fusion/view/nview/detail/nview_impl.hpp b/include/boost/fusion/view/nview/detail/nview_impl.hpp
index 044094ff..deee9ded 100644
--- a/include/boost/fusion/view/nview/detail/nview_impl.hpp
+++ b/include/boost/fusion/view/nview/detail/nview_impl.hpp
@@ -10,7 +10,7 @@
 #if !defined(BOOST_FUSION_NVIEW_IMPL_SEP_23_2009_1017PM)
 #define BOOST_FUSION_NVIEW_IMPL_SEP_23_2009_1017PM
 
-#include <climits>
+//#include <climits>
 #include <boost/preprocessor/cat.hpp>
 #include <boost/preprocessor/repeat.hpp>
 #include <boost/preprocessor/iterate.hpp>
@@ -23,8 +23,6 @@
     "boost/fusion/view/nview/detail/nview_impl.hpp"))                         \
     /**/
 
-#include BOOST_PP_ITERATE()
-
 ///////////////////////////////////////////////////////////////////////////////
 namespace boost { namespace fusion { namespace result_of
 {
@@ -35,12 +33,12 @@ namespace boost { namespace fusion { namespace result_of
         typedef mpl::vector_c<
             int, BOOST_PP_ENUM_PARAMS(FUSION_MAX_VECTOR_SIZE, I)
         > index_type;
-
         typedef nview<Sequence, index_type> type;
     };
-
 }}}
 
+#include BOOST_PP_ITERATE()
+
 #endif
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -50,6 +48,18 @@ namespace boost { namespace fusion { namespace result_of
 
 #define N BOOST_PP_ITERATION()
 
+#if N < FUSION_MAX_VECTOR_SIZE
+namespace boost { namespace fusion { namespace result_of
+{
+    template <typename Sequence, BOOST_PP_ENUM_PARAMS(N, int I)>
+    struct as_nview<Sequence, BOOST_PP_ENUM_PARAMS(N, I)>
+    {
+        typedef mpl::vector_c<int, BOOST_PP_ENUM_PARAMS(N, I)> index_type;
+        typedef nview<Sequence, index_type> type;
+    };
+}}}
+#endif
+
 namespace boost { namespace fusion
 {
     template<BOOST_PP_ENUM_PARAMS(N, int I), typename Sequence>