optional_optimization branch

[SVN r77091]

doc/html/index.html

@@ -37,7 +37,7 @@ can be deduced from their types.</p>
 </tbody>
 </table>
 <!-- @jam_prefix.append('''
-project test : requirements <include>. <implicit-dependency>/boost//headers ;''') -->
+project test : requirements <include>. <source>/boost//headers ;''') -->
 <!-- @example.prepend('''
 #include <boost/parameter.hpp>
 
@@ -727,7 +727,7 @@ worse—think of the kinds of errors you get from your STL
 implementation when you make a mistake).<a class="footnote-reference" href="#conceptcpp" id="id7"><sup>4</sup></a></li>
 <li>The problems with exposing such permissive function template
 signatures have been the subject of much discussion, especially
-in the presence of <a class="reference external" href="http://www.open-std.org/jtc1/sc22/wg21/docs/lwg-defects.html#225">unqualified calls</a>.  If all we want is to
+in the presence of <a class="reference external" href="http://anubis.dkuug.dk/jtc1/sc22/wg21/docs/lwg-defects.html#225">unqualified calls</a>.  If all we want is to
 avoid unintentional argument-dependent lookup (ADL), we can
 isolate <tt class="docutils literal">depth_first_search</tt> in a namespace containing no
 types<a class="footnote-reference" href="#using" id="id8"><sup>6</sup></a>, but suppose we <em>want</em> it to found via ADL?</li>
@@ -1632,7 +1632,7 @@ using boost::mpl::_;''') -->
 int main()
 {}''') -->
 <!-- @test('run', howmany='all') -->
-<p>Note that because of the <a class="reference external" href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2002/n1385.htm">forwarding problem</a>, <tt class="docutils literal"><span class="pre">parameter::parameters::operator()</span></tt>
+<p>Note that because of the <a class="reference external" href="http://std.dkuug.dk/jtc1/sc22/wg21/docs/papers/2002/n1385.htm">forwarding problem</a>, <tt class="docutils literal"><span class="pre">parameter::parameters::operator()</span></tt>
 can't accept non-const rvalues.</p>
 </div>
 <div class="section" id="extracting-parameter-types">

doc/index.rst

@@ -30,7 +30,7 @@ __ ../../../../index.htm
   can be deduced from their types.
 
 .. @jam_prefix.append('''
-        project test : requirements <include>. <implicit-dependency>/boost//headers ;''')
+        project test : requirements <include>. <source>/boost//headers ;''')
 
 .. @example.prepend('''
    #include <boost/parameter.hpp>
@@ -783,7 +783,7 @@ signatures.
    isolate ``depth_first_search`` in a namespace containing no
    types [#using]_, but suppose we *want* it to found via ADL?
 
-__ http://www.open-std.org/jtc1/sc22/wg21/docs/lwg-defects.html#225
+__ http://anubis.dkuug.dk/jtc1/sc22/wg21/docs/lwg-defects.html#225
 
 It's usually a good idea to prevent functions from being considered
 for overload resolution when the passed argument types aren't
@@ -1800,7 +1800,7 @@ its function call operator:
 Note that because of the `forwarding problem`_, ``parameter::parameters::operator()``
 can't accept non-const rvalues.
 
-.. _`forwarding problem`: http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2002/n1385.htm
+.. _`forwarding problem`: http://std.dkuug.dk/jtc1/sc22/wg21/docs/papers/2002/n1385.htm
 
 Extracting Parameter Types
 ==========================

include/boost/parameter/aux_/arg_list.hpp

@@ -78,11 +78,15 @@ struct empty_arg_list
         };
     };
 
+#if !BOOST_WORKAROUND(BOOST_MSVC, <= 1300)
     // Terminator for has_key, indicating that the keyword is unique
     template <class KW>
     static no_tag has_key(KW*);
+#endif
 
-#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
+#if BOOST_WORKAROUND(BOOST_MSVC, <= 1300) \
+    || (BOOST_WORKAROUND(__GNUC__, < 3)) \
+    || BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
 
     // The overload set technique doesn't work with these older
     // compilers, so they need some explicit handholding.
@@ -146,6 +150,11 @@ struct empty_arg_list
     typedef arg_list_tag tag; // For dispatching to sequence intrinsics
 };
 
+#if BOOST_WORKAROUND(BOOST_MSVC, <= 1300)
+template<class KW>
+no_tag operator*(empty_arg_list, KW*);
+#endif
+
 // Forward declaration for arg_list::operator,
 template <class KW, class T>
 struct tagged_argument;
@@ -218,17 +227,25 @@ struct arg_list : Next
         };
     };
 
-#if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
+#if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564)) && !BOOST_WORKAROUND(__GNUC__, == 2)
+# if BOOST_WORKAROUND(BOOST_MSVC, <= 1300)
+    friend yes_tag operator*(arg_list, key_type*);
+#  define BOOST_PARAMETER_CALL_HAS_KEY(next, key) (*(next*)0 * (key*)0)
+# else
     // Overload for key_type, so the assert below will fire if the
     // same keyword is used again
     static yes_tag has_key(key_type*);
     using Next::has_key;
 
+#  define BOOST_PARAMETER_CALL_HAS_KEY(next, key) next::has_key((key*)0)
+# endif
+
     BOOST_MPL_ASSERT_MSG(
-        sizeof(Next::has_key((key_type*)0)) == sizeof(no_tag)
+        sizeof(BOOST_PARAMETER_CALL_HAS_KEY(Next,key_type)) == sizeof(no_tag)
       , duplicate_keyword, (key_type)
     );
 
+# undef BOOST_PARAMETER_CALL_HAS_KEY
 #endif
     //
     // Begin implementation of indexing operators for looking up
@@ -249,7 +266,9 @@ struct arg_list : Next
         return arg.value ? arg.value.get() : arg.value.construct(d.value);
     }
 
-#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
+#if BOOST_WORKAROUND(BOOST_MSVC, <= 1300) \
+    || BOOST_WORKAROUND(__GNUC__, < 3) \
+    || BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
     // These older compilers don't support the overload set creation
     // idiom well, so we need to do all the return type calculation
     // for the compiler and dispatch through an outer function template
@@ -388,6 +407,10 @@ struct arg_list : Next
     typedef arg_list_tag tag; // For dispatching to sequence intrinsics
 };
 
+#if BOOST_WORKAROUND(BOOST_MSVC, <= 1300)  // ETI workaround
+template <> struct arg_list<int,int> {};
+#endif
+
 // MPL sequence support
 template <class ArgumentPack>
 struct arg_list_iterator

include/boost/parameter/aux_/cast.hpp

@@ -7,7 +7,8 @@
 
 # include <boost/detail/workaround.hpp>
 
-# if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
+# if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) \
+  && !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
 #  include <boost/type_traits/add_reference.hpp>
 #  include <boost/type_traits/remove_const.hpp>
 # endif
@@ -16,7 +17,8 @@ namespace boost { namespace parameter { namespace aux {
 
 struct use_default_tag {};
 
-# if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
+# if defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) \
+  || BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
 
 #  define BOOST_PARAMETER_FUNCTION_CAST(value, predicate) value
 

include/boost/parameter/aux_/parenthesized_type.hpp

@@ -18,12 +18,96 @@ namespace boost { namespace parameter { namespace aux {
 template <class UnaryFunctionPointer>
 struct unaryfunptr_arg_type;
 
+# if !BOOST_WORKAROUND(BOOST_MSVC, <= 1300)
+
 template <class Arg>
 struct unaryfunptr_arg_type<void(*)(Arg)>
 {
     typedef Arg type;
 };
 
+# else
+
+// Use the "native typeof" bugfeatures of older versions of MSVC to
+// accomplish what we'd normally do with partial specialization.  This
+// capability was discovered by Igor Chesnokov.
+
+#  if BOOST_WORKAROUND(BOOST_MSVC, != 1300)
+
+// This version applies to VC6.5 and VC7.1 (except that we can just
+// use partial specialization for the latter in this case).
+
+// This gets used as a base class.  
+template<typename Address>
+struct msvc_type_memory
+{
+    // A nullary metafunction that will yield the Value type "stored"
+    // at this Address.
+    struct storage;
+};
+
+template<typename Value, typename Address>
+struct msvc_store_type : msvc_type_memory<Address>
+{
+    // VC++ somehow lets us define the base's nested storage
+    // metafunction here, where we have the Value type we'd like to
+    // "store" in it.  Later we can come back to the base class and
+    // extract the "stored type."
+    typedef msvc_type_memory<Address> location;
+    struct location::storage 
+    {
+        typedef Value type;
+    };
+};
+
+#  else
+
+// This slightly more complicated version of the same thing is
+// required for msvc-7.0
+template<typename Address>
+struct msvc_type_memory
+{
+    template<bool>
+    struct storage_impl;
+
+    typedef storage_impl<true> storage;
+};
+
+template<typename Value, typename Address>
+struct msvc_store_type : msvc_type_memory<Address>
+{
+    // Rather than supplying a definition for the base class' nested
+    // class, we specialize the base class' nested template
+    template<>
+    struct storage_impl<true>  
+    {
+        typedef Value type;
+    };
+};
+
+#  endif
+
+// Function template argument deduction does many of the same things
+// as type matching during partial specialization, so we call a
+// function template to "store" T into the type memory addressed by
+// void(*)(T).
+template <class T>
+msvc_store_type<T,void(*)(T)>
+msvc_store_argument_type(void(*)(T));
+
+template <class FunctionPointer>
+struct unaryfunptr_arg_type
+{
+    // We don't want the function to be evaluated, just instantiated,
+    // so protect it inside of sizeof.
+    enum { dummy = sizeof(msvc_store_argument_type((FunctionPointer)0)) };
+
+    // Now pull the type out of the instantiated base class
+    typedef typename msvc_type_memory<FunctionPointer>::storage::type type;
+};
+
+# endif
+
 template <>
 struct unaryfunptr_arg_type<void(*)(void)>
 {

include/boost/parameter/aux_/set.hpp

@@ -7,7 +7,8 @@
 
 # include <boost/detail/workaround.hpp>
 
-# if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
+# if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564)) \
+  && !BOOST_WORKAROUND(__GNUC__, < 3)
 #  include <boost/mpl/insert.hpp>
 #  include <boost/mpl/set/set0.hpp>
 #  include <boost/mpl/has_key.hpp>

include/boost/parameter/aux_/tagged_argument.hpp

@@ -120,13 +120,13 @@ struct tagged_argument : tagged_argument_base
     }
 # else
     template <class Default>
-    reference operator[](default_<key_type,Default> const& ) const
+    reference operator[](default_<key_type,Default> const& x) const
     {
         return value;
     }
 
     template <class F>
-    reference operator[](lazy_default<key_type,F> const& ) const
+    reference operator[](lazy_default<key_type,F> const& x) const
     {
         return value;
     }

include/boost/parameter/aux_/unwrap_cv_reference.hpp

@@ -44,6 +44,12 @@ struct is_cv_reference_wrapper
     value> type;
 };
 
+#if BOOST_WORKAROUND(MSVC, == 1200)
+template <>
+struct is_cv_reference_wrapper<int>
+  : mpl::false_ {};
+#endif
+
 // Needed for unwrap_cv_reference below. T might be const, so
 // eval_if might fail because of deriving from T const on EDG.
 template <class T>

include/boost/parameter/binding.hpp

@@ -11,13 +11,18 @@
 # include <boost/parameter/aux_/void.hpp>
 # include <boost/type_traits/is_same.hpp>
 
+# if BOOST_WORKAROUND(BOOST_MSVC, < 1300)
+#  include <boost/mpl/eval_if.hpp>
+# endif
+
 namespace boost { namespace parameter { 
 
 // A metafunction that, given an argument pack, returns the type of
 // the parameter identified by the given keyword.  If no such
 // parameter has been specified, returns Default
 
-# if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
+# if BOOST_WORKAROUND(BOOST_MSVC, <= 1300) \
+  || BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
 template <class Parameters, class Keyword, class Default>
 struct binding0
 {
@@ -35,9 +40,14 @@ struct binding0
 # endif
 
 template <class Parameters, class Keyword, class Default = void_>
+# if !BOOST_WORKAROUND(BOOST_MSVC, < 1300)
 struct binding
+# else
+struct binding_eti
+# endif
 {
-# if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
+# if BOOST_WORKAROUND(BOOST_MSVC, <= 1300) \
+  || BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
     typedef typename mpl::eval_if<
         mpl::is_placeholder<Parameters>
       , mpl::identity<int>
@@ -56,8 +66,24 @@ struct binding
     ));
 # endif
 
+# if !BOOST_WORKAROUND(BOOST_MSVC, < 1300)
+    BOOST_MPL_AUX_LAMBDA_SUPPORT(3,binding,(Parameters,Keyword,Default))
+# endif
+};
+
+# if BOOST_WORKAROUND(BOOST_MSVC, < 1300)
+template <class Parameters, class Keyword, class Default = void_>
+struct binding
+{
+    typedef typename mpl::eval_if<
+        is_same<Parameters, int>
+      , mpl::identity<int>
+      , binding_eti<Parameters, Keyword, Default>
+    >::type type;
+
     BOOST_MPL_AUX_LAMBDA_SUPPORT(3,binding,(Parameters,Keyword,Default))
 };
+# endif
 
 // A metafunction that, given an argument pack, returns the type of
 // the parameter identified by the given keyword.  If no such

include/boost/parameter/keyword.hpp

@@ -52,6 +52,7 @@ struct keyword
         return aux::lazy_default<Tag, Default>(default_);
     }
 
+#if !BOOST_WORKAROUND(BOOST_MSVC, < 1300)  // avoid partial ordering bugs
     template <class T>
     typename aux::tag<Tag, T const>::type const
     operator=(T const& x) const
@@ -59,10 +60,15 @@ struct keyword
         typedef typename aux::tag<Tag, T const>::type result;
         return result(x);
     }
+#endif 
 
+#if !BOOST_WORKAROUND(BOOST_MSVC, < 1300)  // avoid partial ordering bugs
     template <class Default>
     aux::default_<Tag, const Default>
     operator|(const Default& default_) const
+#if BOOST_WORKAROUND(BOOST_MSVC, == 1300)
+        volatile
+#endif 
     {
         return aux::default_<Tag, const Default>(default_);
     }
@@ -70,9 +76,13 @@ struct keyword
     template <class Default>
     aux::lazy_default<Tag, Default>
     operator||(Default const& default_) const
+#if BOOST_WORKAROUND(BOOST_MSVC, == 1300)
+        volatile
+#endif 
     {
         return aux::lazy_default<Tag, Default>(default_);
     }
+#endif
 
  public: // Insurance against ODR violations
     
@@ -99,6 +109,24 @@ keyword<Tag> const keyword<Tag>::instance = {};
 // reference in an anonymous namespace to a singleton instance of that
 // type.
 
+#if BOOST_WORKAROUND(BOOST_MSVC, < 1300)
+
+# define BOOST_PARAMETER_KEYWORD(tag_namespace,name)                    \
+    namespace tag_namespace                                             \
+    {                                                                   \
+      struct name                                                       \
+      {                                                                 \
+          static char const* keyword_name()                             \
+          {                                                             \
+              return #name;                                             \
+          }                                                             \
+      };                                                                \
+    }                                                                   \
+    static ::boost::parameter::keyword<tag_namespace::name> const& name \
+       = ::boost::parameter::keyword<tag_namespace::name>::instance;
+
+#else
+
 #define BOOST_PARAMETER_KEYWORD(tag_namespace,name)                 \
     namespace tag_namespace                                         \
     {                                                               \
@@ -116,6 +144,8 @@ keyword<Tag> const keyword<Tag>::instance = {};
        = ::boost::parameter::keyword<tag_namespace::name>::instance;\
     }
 
+#endif
+
 }} // namespace boost::parameter
 
 #endif // KEYWORD_050328_HPP

include/boost/parameter/name.hpp

@@ -16,6 +16,7 @@
 # include <boost/mpl/placeholders.hpp>
 
 # if !defined(BOOST_NO_SFINAE) \
+  && !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) \
   && !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x592))
 
 #  include <boost/utility/enable_if.hpp>
@@ -74,6 +75,19 @@ struct lambda<
 #  define BOOST_PARAMETER_IS_BINARY(x) BOOST_PP_IS_BINARY(x)
 # endif
 
+# if BOOST_WORKAROUND(BOOST_MSVC, < 1300)
+#  define BOOST_PARAMETER_NAME_OBJECT(tag, name)                    \
+    static ::boost::parameter::keyword<tag> const& name             \
+       = ::boost::parameter::keyword<tag>::instance;
+# else
+#  define BOOST_PARAMETER_NAME_OBJECT(tag, name)                    \
+    namespace                                                       \
+    {                                                               \
+       ::boost::parameter::keyword<tag> const& name                 \
+       = ::boost::parameter::keyword<tag>::instance;                \
+    }
+# endif
+
 # define BOOST_PARAMETER_BASIC_NAME(tag_namespace, tag, name)       \
     namespace tag_namespace                                         \
     {                                                               \
@@ -93,11 +107,7 @@ struct lambda<
           > _1;                                                     \
       };                                                            \
     }                                                               \
-    namespace                                                       \
-    {                                                               \
-       ::boost::parameter::keyword<tag_namespace::tag> const& name  \
-       = ::boost::parameter::keyword<tag_namespace::tag>::instance; \
-    }
+    BOOST_PARAMETER_NAME_OBJECT(tag_namespace::tag, name)
 
 # define BOOST_PARAMETER_COMPLEX_NAME_TUPLE1(tag,namespace)         \
     (tag, namespace), ~

include/boost/parameter/preprocessor.hpp

@@ -37,6 +37,10 @@
 # include <boost/mpl/always.hpp>
 # include <boost/mpl/apply_wrap.hpp>
 
+# if BOOST_WORKAROUND(BOOST_MSVC, <= 1300)
+#  include <boost/type.hpp>
+# endif
+
 namespace boost { namespace parameter { namespace aux {
 
 #  if ! defined(BOOST_NO_SFINAE) && ! BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x592))
@@ -98,6 +102,41 @@ struct match
 {};
 # endif 
 
+# if BOOST_WORKAROUND(BOOST_MSVC, == 1300)
+
+// Function template argument deduction does many of the same things
+// as type matching during partial specialization, so we call a
+// function template to "store" T into the type memory addressed by
+// void(*)(T).
+template <class T>
+msvc_store_type<T,void*(*)(void**(T))>
+msvc_store_predicate_type(void*(*)(void**(T)));
+
+template <class T>
+msvc_store_type<boost::is_convertible<mpl::_,T>,void*(*)(void*(T))>
+msvc_store_predicate_type(void*(*)(void*(T)));
+
+template <class FunctionType>
+struct unwrap_predicate
+{
+    static FunctionType f;
+
+    // We don't want the function to be evaluated, just instantiated,
+    // so protect it inside of sizeof.
+    enum { dummy = sizeof(msvc_store_predicate_type(f)) };
+
+    // Now pull the type out of the instantiated base class
+    typedef typename msvc_type_memory<FunctionType>::storage::type type;
+};
+
+template <>
+struct unwrap_predicate<void*(*)(void**)>
+{
+    typedef mpl::always<mpl::true_> type;
+};
+
+# endif
+
 # undef false_
 
 template <
@@ -119,6 +158,7 @@ struct argument_pack
     typedef typename mpl::first<result>::type type;
 };
 
+# if 1 //BOOST_WORKAROUND(BOOST_MSVC, < 1300)
 // Works around VC6 problem where it won't accept rvalues.
 template <class T>
 T& as_lvalue(T& value, long)
@@ -131,9 +171,11 @@ T const& as_lvalue(T const& value, int)
 {
     return value;
 }
+# endif
 
 
-# if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
+# if BOOST_WORKAROUND(BOOST_MSVC, < 1300) \
+  || BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
 
 template <class Predicate, class T, class Args>
 struct apply_predicate
@@ -460,7 +502,13 @@ struct funptr_predicate<void**>
 #  define BOOST_PARAMETER_FUNCTION_PARAMETERS_QUALIFIER_deduced_required(tag) \
     required<boost::parameter::deduced<tag>
 
-# if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
+# if !BOOST_WORKAROUND(BOOST_MSVC, < 1300) && !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
+
+#  if BOOST_WORKAROUND(BOOST_MSVC, == 1300)
+#   define BOOST_PARAMETER_PREDICATE_TYPE(p) void*(*) (void* p)
+#  else
+#   define BOOST_PARAMETER_PREDICATE_TYPE(p) void p
+#  endif
 
 #  define BOOST_PARAMETER_FUNCTION_PARAMETERS_M(r,tag_namespace,i,elem) \
     BOOST_PP_COMMA_IF(i) \
@@ -473,9 +521,24 @@ struct funptr_predicate<void**>
         ) \
     ) \
       , typename boost::parameter::aux::unwrap_predicate< \
-            void BOOST_PARAMETER_FN_ARG_PRED(elem) \
+            BOOST_PARAMETER_PREDICATE_TYPE(BOOST_PARAMETER_FN_ARG_PRED(elem)) \
         >::type \
     >
+# elif BOOST_WORKAROUND(BOOST_MSVC, < 1300)
+#  define BOOST_PARAMETER_FUNCTION_PARAMETERS_M(r,tag_namespace,i,elem) \
+    BOOST_PP_COMMA_IF(i) \
+    boost::parameter::BOOST_PP_CAT( \
+        BOOST_PARAMETER_FUNCTION_PARAMETERS_QUALIFIER_ \
+      , BOOST_PARAMETER_FN_ARG_QUALIFIER(elem) \
+    )( \
+        tag_namespace::BOOST_PARAMETER_FUNCTION_KEYWORD( \
+            BOOST_PARAMETER_FN_ARG_KEYWORD(elem) \
+        ) \
+    ) \
+      , boost::parameter::aux::funptr_predicate< \
+            void* BOOST_PARAMETER_FN_ARG_PRED(elem) \
+        > \
+    >
 # elif BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
 #  define BOOST_PARAMETER_FUNCTION_PARAMETERS_M(r,tag_namespace,i,elem) \
     BOOST_PP_COMMA_IF(i) \
@@ -520,6 +583,21 @@ struct funptr_predicate<void**>
         typedef typename BOOST_PARAMETER_PARENTHESIZED_TYPE(result) type;                       \
     };
 
+# if BOOST_WORKAROUND(BOOST_MSVC, <= 1300)
+
+#  define BOOST_PARAMETER_FUNCTION_RESULT(result, name, args)  \
+    BOOST_PARAMETER_FUNCTION_RESULT_(result, name, args)        \
+    template <>                                                 \
+    struct BOOST_PARAMETER_FUNCTION_RESULT_NAME(name)<int>      \
+    { typedef int type; };
+
+# else
+
+#  define BOOST_PARAMETER_FUNCTION_RESULT(result, name, args)  \
+    BOOST_PARAMETER_FUNCTION_RESULT_(result, name, args)
+
+# endif
+
 // Defines implementation function
 # define BOOST_PARAMETER_FUNCTION_IMPL_HEAD(name)           \
     template <class Args>                                   \
@@ -818,7 +896,7 @@ struct funptr_predicate<void**>
     BOOST_PARAMETER_MEMBER_FUNCTION_STATIC(name) \
     ResultType BOOST_PARAMETER_FUNCTION_DEFAULT_NAME(name)( \
         ResultType(*)() \
-      , Args const& \
+      , Args const& args \
       , int \
         BOOST_PARAMETER_FUNCTION_DEFAULT_ARGUMENTS( \
             BOOST_PARAMETER_FUNCTION_DEFAULT_FUNCTION_ARG \
@@ -837,7 +915,7 @@ struct funptr_predicate<void**>
 
 // Defines the result metafunction and the parameters specialization.
 # define BOOST_PARAMETER_FUNCTION_HEAD(result, name, tag_namespace, args)   \
-      BOOST_PARAMETER_FUNCTION_RESULT_(result, name, args)                   \
+      BOOST_PARAMETER_FUNCTION_RESULT(result, name, args)                   \
                                                                             \
           BOOST_PARAMETER_FUNCTION_PARAMETERS(tag_namespace, name, args)    \
           BOOST_PARAMETER_FUNCTION_PARAMETERS_NAME(name);                   \
@@ -943,6 +1021,18 @@ struct funptr_predicate<void**>
     BOOST_PP_COMMA_IF(i) elem& BOOST_PP_CAT(a, i)
 /**/
 
+# if BOOST_WORKAROUND(BOOST_MSVC, <= 1300)
+
+// Older MSVC can't do what's necessary to handle commas in base names; just
+// use a typedef instead if you have a base name that contains commas.
+#  define BOOST_PARAMETER_PARENTHESIZED_BASE(x) BOOST_PP_SEQ_HEAD(x)
+
+# else
+
+#  define BOOST_PARAMETER_PARENTHESIZED_BASE(x) BOOST_PARAMETER_PARENTHESIZED_TYPE(x)
+
+# endif
+
 # define BOOST_PARAMETER_FUNCTION_FWD_CONSTRUCTOR00(z, n, r, data, elem) \
     BOOST_PP_IF( \
         n \
@@ -967,7 +1057,7 @@ struct funptr_predicate<void**>
           , n \
         ) \
     ) \
-      : BOOST_PARAMETER_PARENTHESIZED_TYPE(BOOST_PP_TUPLE_ELEM(6,3,data)) ( \
+      : BOOST_PARAMETER_PARENTHESIZED_BASE(BOOST_PP_TUPLE_ELEM(6,3,data)) ( \
             BOOST_PP_CAT(constructor_parameters, __LINE__)()( \
                 BOOST_PP_ENUM_PARAMS_Z(z, n, a) \
             ) \
@@ -1058,7 +1148,18 @@ struct funptr_predicate<void**>
       , (const ParameterArgumentType ## i)(ParameterArgumentType ## i) \
       , (const ParameterArgumentType ## i) \
     ))
+// MSVC6.5 lets us bind rvalues to T&.
+# elif BOOST_WORKAROUND(BOOST_MSVC, < 1300)
+#  define BOOST_PARAMETER_FUNCTION_FWD_COMBINATION(r, _, i, elem) \
+    (BOOST_PP_IF( \
+        BOOST_PARAMETER_FUNCTION_IS_KEYWORD_QUALIFIER( \
+            BOOST_PARAMETER_FN_ARG_NAME(elem) \
+        ) \
+      , (ParameterArgumentType ## i) \
+      , (const ParameterArgumentType ## i) \
+    ))
 // No partial ordering. This feature doesn't work.
+// This is exactly the same as for VC6.5, but we might change it later.
 # else
 #  define BOOST_PARAMETER_FUNCTION_FWD_COMBINATION(r, _, i, elem) \
     (BOOST_PP_IF( \

include/boost/parameter/value_type.hpp

@@ -12,13 +12,18 @@
 # include <boost/parameter/aux_/void.hpp>
 # include <boost/type_traits/is_same.hpp>
 
+# if BOOST_WORKAROUND(BOOST_MSVC, < 1300)
+#  include <boost/mpl/eval_if.hpp>
+# endif
+
 namespace boost { namespace parameter { 
 
 // A metafunction that, given an argument pack, returns the type of
 // the parameter identified by the given keyword.  If no such
 // parameter has been specified, returns Default
 
-# if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
+# if BOOST_WORKAROUND(BOOST_MSVC, <= 1300) \
+  || BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
 template <class Parameters, class Keyword, class Default>
 struct value_type0
 {
@@ -36,9 +41,14 @@ struct value_type0
 # endif
 
 template <class Parameters, class Keyword, class Default = void_>
+# if !BOOST_WORKAROUND(BOOST_MSVC, < 1300)
 struct value_type
+# else
+struct value_type_eti
+# endif
 {
-# if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
+# if BOOST_WORKAROUND(BOOST_MSVC, <= 1300) \
+  || BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
     typedef typename mpl::eval_if<
         mpl::is_placeholder<Parameters>
       , mpl::identity<int>
@@ -57,8 +67,24 @@ struct value_type
     ));
 # endif
 
+# if !BOOST_WORKAROUND(BOOST_MSVC, < 1300)
+    BOOST_MPL_AUX_LAMBDA_SUPPORT(3,value_type,(Parameters,Keyword,Default))
+# endif
+};
+
+# if BOOST_WORKAROUND(BOOST_MSVC, < 1300)
+template <class Parameters, class Keyword, class Default = void_>
+struct value_type
+{
+    typedef typename mpl::eval_if<
+        is_same<Parameters, int>
+      , mpl::identity<int>
+      , value_type_eti<Parameters, Keyword, Default>
+    >::type type;
+
     BOOST_MPL_AUX_LAMBDA_SUPPORT(3,value_type,(Parameters,Keyword,Default))
 };
+# endif
 
 // A metafunction that, given an argument pack, returns the type of
 // the parameter identified by the given keyword.  If no such

meta/libraries.json

@@ -1,17 +0,0 @@
-{
-    "key": "parameter",
-    "name": "Parameter",
-    "authors": [
-        "David Abrahams",
-        "Daniel Wallin"
-    ],
-    "description": "Boost.Parameter Library - Write functions that accept arguments by name.",
-    "category": [
-        "Emulation",
-        "Programming"
-    ],
-    "maintainers": [
-        "David Abrahams <dave -at- boost-consulting.com>",
-        "Daniel Wallin <daniel -at- boostpro.com>"
-    ]
-}

test/literate/building-argumentpacks0.cpp

@@ -1,6 +1,8 @@
 
+#line 1744 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
 #include <boost/parameter.hpp>
 #include <iostream>
+#line 1733 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
 BOOST_PARAMETER_NAME(index)
 
 template <class ArgumentPack>
@@ -12,6 +14,7 @@ int print_index(ArgumentPack const& args)
 
 int x = print_index(_index = 3);  // prints "index = 3"
 
+#line 1752 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
 BOOST_PARAMETER_NAME(name)
 
 template <class ArgumentPack>
@@ -24,11 +27,13 @@ int print_name_and_index(ArgumentPack const& args)
 int y = print_name_and_index((_index = 3, _name = "jones"));
 
 
+#line 1787 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
 namespace parameter = boost::parameter;
 using parameter::required;
 using parameter::optional;
 using boost::is_convertible;
 using boost::mpl::_;
+#line 1773 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
 parameter::parameters<
     required<tag::name, is_convertible<_,char const*> >
   , optional<tag::index, is_convertible<_,int> >
@@ -42,6 +47,7 @@ int z0 = print_name_and_index( spec(sam, twelve) );
 int z1 = print_name_and_index(
    spec(_index=12, _name="sam")
 );
+#line 1794 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
 int main()
 {}
 

test/literate/class-template-skeleton0.cpp

@@ -1,5 +1,7 @@
 
+#line 1387 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
 #include <boost/parameter.hpp>
+#line 1373 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
 namespace boost { namespace python {
 
 template <

test/literate/deduced-parameters0.cpp

@@ -1,4 +1,5 @@
 
+#line 1062 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
 #include <boost/parameter.hpp>
 
 BOOST_PARAMETER_NAME(name)
@@ -30,6 +31,7 @@ default_call_policies some_policies;
 
 void f()
 {}
+#line 1029 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
 namespace mpl = boost::mpl;
 
 BOOST_PARAMETER_FUNCTION(
@@ -62,13 +64,17 @@ BOOST_PARAMETER_FUNCTION(
  }
 
 
+#line 1111 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
 int main()
 {
+#line 1108 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
 def("f", &f, some_policies, "Documentation for f");
 def("f", &f, "Documentation for f", some_policies);
 
+#line 1121 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
 def(
     "f", &f
    , _policies = some_policies, "Documentation for f");
+#line 1124 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
 }
 

test/literate/deduced-template-parameters0.cpp

@@ -1,4 +1,5 @@
 
+#line 1557 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
 #include <boost/parameter.hpp>
 #include <boost/mpl/is_sequence.hpp>
 #include <boost/noncopyable.hpp>
@@ -15,6 +16,7 @@ BOOST_PARAMETER_TEMPLATE_KEYWORD(held_type)
 BOOST_PARAMETER_TEMPLATE_KEYWORD(copyable)
 
 }}
+#line 1546 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
 namespace boost { namespace python {
 
 namespace detail { struct bases_base {}; }
@@ -26,8 +28,10 @@ struct bases : detail::bases_base
 }}
 
 
+#line 1600 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
 #include <boost/type_traits/is_class.hpp>
 namespace boost { namespace python {
+#line 1578 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
 typedef parameter::parameters<
     required<tag::class_type, is_class<_> >
 
@@ -49,6 +53,7 @@ typedef parameter::parameters<
   , parameter::optional<deduced<tag::copyable>, is_same<noncopyable,_> >
 
 > class_signature;
+#line 1604 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
 template <
     class A0
   , class A1 = parameter::void_
@@ -80,13 +85,16 @@ struct class_
 
 
 
+#line 1644 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
 struct B {};
 struct D {};
 
 using boost::python::bases;
+#line 1640 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
 typedef boost::python::class_<B, boost::noncopyable> c1;
 
 typedef boost::python::class_<D, std::auto_ptr<D>, bases<B> > c2;
+#line 1650 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
 BOOST_MPL_ASSERT((boost::is_same<c1::class_type, B>));
 BOOST_MPL_ASSERT((boost::is_same<c1::base_list, bases<> >));
 BOOST_MPL_ASSERT((boost::is_same<c1::held_type, B>));

test/literate/default-expression-evaluation0.cpp

@@ -1,4 +1,5 @@
 
+#line 730 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
 #include <boost/parameter.hpp>
 #include <iostream>
 
@@ -7,6 +8,7 @@ BOOST_PARAMETER_NAME(visitor)
 BOOST_PARAMETER_NAME(root_vertex)
 BOOST_PARAMETER_NAME(index_map)
 BOOST_PARAMETER_NAME(color_map)
+#line 702 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
 #include <boost/graph/depth_first_search.hpp> // for dfs_visitor
 
 BOOST_PARAMETER_FUNCTION(

test/literate/defining-the-keywords0.cpp

@@ -1,3 +1,4 @@
+#line 397 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
 #include <boost/parameter/name.hpp>
 
 namespace graphs

test/literate/defining-the-keywords1.cpp

@@ -1,5 +1,7 @@
 
+#line 424 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
 #include <boost/parameter/keyword.hpp>
+#line 413 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
 namespace graphs
 {
   namespace tag { struct graph; } // keyword tag type

test/literate/exercising-the-code-so-far0.cpp

@@ -1,4 +1,5 @@
 
+#line 1415 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
 #include <boost/parameter.hpp>
 #include <boost/mpl/is_sequence.hpp>
 #include <boost/noncopyable.hpp>
@@ -19,6 +20,7 @@ struct bases
 {};
 
 }}
+#line 1402 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
 namespace boost { namespace python {
 
 using boost::mpl::_;
@@ -32,6 +34,7 @@ typedef parameter::parameters<
 
 }}
 
+#line 1454 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
 namespace boost { namespace python {
 
 template <
@@ -64,6 +67,7 @@ struct class_
 }}
 
 
+#line 1 "None"
 using boost::python::class_type;
 using boost::python::copyable;
 using boost::python::held_type;
@@ -72,6 +76,7 @@ using boost::python::bases;
 
 struct B {};
 struct D {};
+#line 1495 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
 typedef boost::python::class_<
     class_type<B>, copyable<boost::noncopyable>
 > c1;
@@ -80,6 +85,7 @@ typedef boost::python::class_<
     D, held_type<std::auto_ptr<D> >, base_list<bases<B> >
 > c2;
 
+#line 1515 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
 BOOST_MPL_ASSERT((boost::is_same<c1::class_type, B>));
 BOOST_MPL_ASSERT((boost::is_same<c1::base_list, bases<> >));
 BOOST_MPL_ASSERT((boost::is_same<c1::held_type, B>));

test/literate/extracting-parameter-types0.cpp

@@ -1,6 +1,8 @@
 
+#line 1830 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
 #include <boost/parameter.hpp>
 #include <cassert>
+#line 1813 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
 BOOST_PARAMETER_NAME(name)
 BOOST_PARAMETER_NAME(index)
 
@@ -17,6 +19,7 @@ int deduce_arg_types(ArgumentPack const& args)
 {
     return deduce_arg_types_impl(args[_name], args[_index|42]);
 }
+#line 1834 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
 int a1 = deduce_arg_types((_name = "foo"));
 int a2 = deduce_arg_types((_name = "foo", _index = 3));
 

test/literate/extracting-parameter-types1.cpp

@@ -1,9 +1,11 @@
 
+#line 1863 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
 #include <boost/parameter.hpp>
 #include <boost/type_traits/remove_reference.hpp>
 #include <cassert>
 
 namespace parameter = boost::parameter;
+#line 1852 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
 BOOST_PARAMETER_NAME(index)
 
 template <class ArgumentPack>
@@ -14,6 +16,7 @@ twice_index(ArgumentPack const& args)
 }
 
 int six = twice_index(_index = 3);
+#line 1871 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
 int main()
 {
     assert(six == 6);

test/literate/fine-grained-name-control0.cpp

@@ -1,5 +1,7 @@
 
+#line 1703 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
 #include <boost/parameter.hpp>
+#line 1693 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
 BOOST_PARAMETER_NAME((pass_foo, keywords) foo)
 
 BOOST_PARAMETER_FUNCTION(
@@ -10,6 +12,7 @@ BOOST_PARAMETER_FUNCTION(
 }
 
 int x = f(pass_foo = 41);
+#line 1704 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
 int main()
 {}
 

test/literate/handling-out-parameters0.cpp

@@ -1,4 +1,5 @@
 
+#line 620 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
 #include <boost/parameter.hpp>
 
 namespace boost
@@ -19,6 +20,7 @@ BOOST_PARAMETER_NAME(color_map)
 
 BOOST_PARAMETER_FUNCTION((void), f, tag,
   (required (graph, *))
+#line 612 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
 (optional
     (visitor,            *, boost::dfs_visitor<>())
     (root_vertex,        *, *vertices(graph).first)
@@ -26,5 +28,6 @@ BOOST_PARAMETER_FUNCTION((void), f, tag,
     (in_out(color_map), *,
       default_color_map(num_vertices(graph), index_map) )
 )
+#line 642 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
 ) {}
 

test/literate/headers-and-namespaces0.cpp

@@ -1,3 +1,5 @@
+#line 274 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
 #include <boost/parameter/keyword.hpp>
+#line 283 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
 using boost::parameter::keyword;
 

test/literate/lazy-default-computation0.cpp

@@ -1,8 +1,10 @@
 
+#line 1911 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
 #include <boost/parameter.hpp>
 #include <string>
 
 namespace parameter = boost::parameter;
+#line 1894 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
 BOOST_PARAMETER_NAME(s1)
 BOOST_PARAMETER_NAME(s2)
 BOOST_PARAMETER_NAME(s3)
@@ -19,6 +21,7 @@ std::string f(ArgumentPack const& args)
 }
 
 std::string x = f((_s1="hello,", _s2=" world", _s3="hi world"));
+#line 1917 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
 int main()
 {}
 

test/literate/lazy-default-computation1.cpp

@@ -1,4 +1,5 @@
 
+#line 1943 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
 #include <boost/bind.hpp>
 #include <boost/ref.hpp>
 #include <boost/parameter.hpp>
@@ -16,10 +17,12 @@ std::string f(ArgumentPack const& args)
 {
     std::string const& s1 = args[_s1];
     std::string const& s2 = args[_s2];
+#line 1938 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
 typename parameter::binding<
     ArgumentPack, tag::s3, std::string
 >::type s3 = args[_s3
     || boost::bind(std::plus<std::string>(), boost::ref(s1), boost::ref(s2)) ];
+#line 1962 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
     return s3;
 }
 

test/literate/namespaces0.cpp

@@ -1,6 +1,9 @@
 
+#line 2082 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
+#line 2085 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
 #include <boost/parameter.hpp>
 #include <iostream>
+#line 2071 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
 namespace lib
 {
   BOOST_PARAMETER_NAME(name)
@@ -15,6 +18,8 @@ namespace lib
       return index;
   }
 }
+#line 2098 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
 int x = lib::f(lib::_name = "jill", lib::_index = 1);
+#line 2102 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
 int main() {}
 

test/literate/namespaces1.cpp

@@ -1,6 +1,9 @@
 
+#line 2100 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
+#line 2085 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
 #include <boost/parameter.hpp>
 #include <iostream>
+#line 2071 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
 namespace lib
 {
   BOOST_PARAMETER_NAME(name)
@@ -15,9 +18,11 @@ namespace lib
       return index;
   }
 }
+#line 2111 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
 using lib::_name;
 using lib::_index;
 
 int x = lib::f(_name = "jill", _index = 1);
+#line 2120 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
 int main() {}
 

test/literate/namespaces2.cpp

@@ -1,6 +1,9 @@
 
+#line 2114 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
+#line 2085 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
 #include <boost/parameter.hpp>
 #include <iostream>
+#line 2071 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
 namespace lib
 {
   BOOST_PARAMETER_NAME(name)
@@ -15,7 +18,9 @@ namespace lib
       return index;
   }
 }
+#line 2128 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
 using namespace lib;
 int x = f(_name = "jill", _index = 3);
+#line 2134 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
 int main() {}
 

test/literate/namespaces3.cpp

@@ -1,6 +1,8 @@
 
+#line 2161 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
 #include <boost/parameter.hpp>
 #include <iostream>
+#line 2143 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
 namespace lib
 {
   namespace keywords
@@ -19,7 +21,9 @@ namespace lib
   }
 }
 
+#line 2170 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
 using namespace lib::keywords;
 int y = lib::f(_name = "bob", _index = 2);
+#line 2172 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
 int main() {}
 

test/literate/optional-parameters0.cpp

@@ -1,4 +1,5 @@
 
+#line 571 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
 #include <boost/parameter.hpp>
 
 namespace boost
@@ -18,11 +19,13 @@ BOOST_PARAMETER_NAME(color_map)
 
 BOOST_PARAMETER_FUNCTION((void), f, tag,
   (required (graph, *))
+#line 563 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
 (optional     (visitor,           *, boost::dfs_visitor<>())
     (root_vertex,       *, *vertices(graph).first)
     (index_map,         *, get(boost::vertex_index,graph))
     (in_out(color_map), *,
       default_color_map(num_vertices(graph), index_map) )
 )
+#line 592 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
 ) {}
 

test/literate/parameter-enabled-constructors0.cpp

@@ -1,6 +1,8 @@
 
+#line 1248 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
 #include <boost/parameter.hpp>
 #include <iostream>
+#line 1234 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
 BOOST_PARAMETER_NAME(name)
 BOOST_PARAMETER_NAME(index)
 
@@ -15,6 +17,7 @@ struct myclass_impl
     }
 };
 
+#line 1261 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
 struct myclass : myclass_impl
 {
     BOOST_PARAMETER_CONSTRUCTOR(
@@ -23,9 +26,12 @@ struct myclass : myclass_impl
 };
 
 
+#line 1275 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
 int main() {
+#line 1272 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
 myclass x("bob", 3);                     // positional
 myclass y(_index = 12, _name = "sally"); // named
 myclass z("june");                       // positional/defaulted
+#line 1275 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
 }
 

test/literate/parameter-enabled-member-functions0.cpp

@@ -1,7 +1,9 @@
 
+#line 1154 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
 #include <boost/parameter.hpp>
 #include <iostream>
 using namespace boost::parameter;
+#line 1142 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
 BOOST_PARAMETER_NAME(arg1)
 BOOST_PARAMETER_NAME(arg2)
 

test/literate/parameter-enabled-member-functions1.cpp

@@ -1,9 +1,11 @@
 
+#line 1177 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
 #include <boost/parameter.hpp>
 
 BOOST_PARAMETER_NAME(arg1)
 BOOST_PARAMETER_NAME(arg2)
 using namespace boost::parameter;
+#line 1166 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
 struct callable2
 {
     BOOST_PARAMETER_CONST_MEMBER_FUNCTION(

test/literate/predicate-requirements0.cpp

@@ -1,4 +1,5 @@
 
+#line 935 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
 #include <boost/parameter.hpp>
 #include <boost/graph/adjacency_list.hpp>
 #include <boost/graph/depth_first_search.hpp>
@@ -10,6 +11,7 @@ BOOST_PARAMETER_NAME((_index_map, graphs) index_map)
 BOOST_PARAMETER_NAME((_color_map, graphs) color_map)
 
 using boost::mpl::_;
+#line 859 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
 // We first need to define a few metafunction that we use in the
 // predicates below.
 
@@ -85,6 +87,7 @@ BOOST_PARAMETER_FUNCTION(
        , default_color_map(num_vertices(graph), index_map) )
     )
 )
+#line 949 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
 {}
 
 int main()
@@ -97,7 +100,7 @@ int main()
                  E(w,z), E(z, z)};
     G g(edges, edges + sizeof(edges) / sizeof(E), N);
 
-    ::depth_first_search(g);
-    ::depth_first_search(g, _root_vertex = (int)x);
+    depth_first_search(g);
+    depth_first_search(g, _root_vertex = (int)x);
 }
 

test/literate/required-parameters0.cpp

@@ -1,9 +1,12 @@
 
+#line 540 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
 #include <boost/parameter.hpp>
 
 BOOST_PARAMETER_NAME(graph)
 
 BOOST_PARAMETER_FUNCTION((void), f, tag,
+#line 531 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
 (required (graph, *) )
+#line 547 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
 ) {}
 

test/literate/static-member-functions0.cpp

@@ -1,7 +1,9 @@
 
+#line 1206 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
 #include <boost/parameter.hpp>
 #include <iostream>
 using namespace boost::parameter;
+#line 1195 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
 BOOST_PARAMETER_NAME(arg1)
 
 struct somebody

test/literate/template-keywords0.cpp

@@ -1,5 +1,7 @@
 
+#line 1337 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
 #include <boost/parameter.hpp>
+#line 1329 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
 namespace boost { namespace python {
 
 BOOST_PARAMETER_TEMPLATE_KEYWORD(class_type)

test/literate/template-keywords1.cpp

@@ -1,5 +1,7 @@
 
+#line 1353 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
 #include <boost/parameter.hpp>
+#line 1344 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
 namespace boost { namespace python {
 
 namespace tag { struct class_type; } // keyword tag type

test/literate/top-level0.cpp

@@ -1,4 +1,5 @@
 
+#line 35 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
 #include <boost/parameter.hpp>
 
 namespace test
@@ -30,6 +31,7 @@ namespace test
 }
 using namespace test;
 int x = 
+#line 19
 new_window("alert", _width=10, _titlebar=false);
 
 smart_ptr<

test/literate/writing-the-function0.cpp

@@ -1,4 +1,5 @@
 
+#line 472 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
 #include <boost/parameter/name.hpp>
 
 BOOST_PARAMETER_NAME(graph)
@@ -16,6 +17,7 @@ struct dfs_visitor
 int vertex_index = 0;
 
 }
+#line 446 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
 #include <boost/parameter/preprocessor.hpp>
 
 namespace graphs