diff --git a/doc/reference.html b/doc/reference.html index 85ead4b..e36a3c2 100644 --- a/doc/reference.html +++ b/doc/reference.html @@ -22,19 +22,19 @@ }; // For N in [0, MAX_ARGS] - template<typename ResultType, + template<typename Signature, typename Arg1, typename Arg2, ... typename ArgN, - typename Policy = empty_function_policy, - typename Mixin = empty_function_mixin, + typename Policy = empty_function_policy, // Deprecated + typename Mixin = empty_function_mixin, // Deprecated typename Allocator = std::allocator<function_base> > class functionN : public function_base, public Mixin { typedef ResultType result_type; // [1] - typedef Policy policy_type; - typedef Mixin mixin_type; + typedef Policy policy_type; // Deprecated + typedef Mixin mixin_type; // Deprecated typedef Allocator allocator_type; typedef Arg1 argument_type; // If N == 1 @@ -52,8 +52,8 @@ functionN& operator=(const functionN&); template<typename F> functionN& operator=(F); template<typename F> functionN& operator=(reference_wrapper<F>); - void set(const functionN&); - template<typename F> void set(F); + void set(const functionN&); // Deprecated + template<typename F> void set(F); // Deprecated void swap(functionN&); void clear(); @@ -66,22 +66,17 @@ typename Arg2, ... typename ArgN, - typename Policy, - typename Mixin, + typename Policy, // Deprecated + typename Mixin, // Deprecated typename Allocator> void swap(functionN<ResultType, Arg1, Arg2, ..., ArgN, Policy, Mixin, Allocator>&, functionN<ResultType, Arg1, Arg2, ..., ArgN, Policy, Mixin, Allocator>&); // For any N in [0, MAX_ARGS] - template<typename ResultType, - typename Arg1, - typename Arg2, - ... - typename ArgN, - typename ArgN+1 = implementation-defined, - typename ArgN+2 = implementation-defined, - ... - typename ArgMAX_ARGS = implementation-defined> + template<typename Signature, // Function type: ResultType (Arg1, Arg2, ..., ArgN) + typename Policy = empty_function_policy, // Deprecated + typename Mixin = empty_function_mixin, // Deprecated + typename Allocator = std::allocator<function_base> > class function : public functionN<ResultType, Arg1, Arg2, ..., ArgN> { // Construction @@ -94,18 +89,14 @@ function& operator=(const function&); function& operator=(const functionN<ResultType, Arg1, Arg2, ..., ArgN>&); template<typename F> function& operator=(F); - void set(const function&); - void set(const functionN<ResultType, Arg1, Arg2, ..., ArgN>&); - template<typename F> void set(F); + void set(const function&); // Deprecated + void set(const functionN<ResultType, Arg1, Arg2, ..., ArgN>&); // Deprecated + template<typename F> void set(F); // Deprecated }; - template<typename ResultType, - typename Arg1, - typename Arg2, - ... - typename ArgMAX_ARGS> - void swap(function<ResultType, Arg1, Arg2, ..., ArgMAX_ARGS>&, - function<ResultType, Arg1, Arg2, ..., ArgMAX_ARGS>&); + template<typename Signature, typename Policy, typename Mixin, typename Allocator> + void swap(function<Signature, Policy, Mixin, Allocator>&, + function<Signature, Policy, Mixin, Allocator>&); } @@ -218,11 +209,13 @@

void set(const functionN& g);

template<typename F> void set(F g);

void swap(functionN& g); @@ -248,6 +241,7 @@

  • policy.postcall(this);
  • Returns: the value returned by target.
    • +
  • Note: invocation policies have been deprecated and will be removed in a later release.

    • Class template function

    @@ -263,8 +257,8 @@ typename Arg2, ... typename ArgN, - typename Policy, - typename Mixin, + typename Policy, // Deprecated + typename Mixin, // Deprecated typename Allocator> void swap(functionN<ResultType, Arg1, Arg2, ..., ArgN, Policy, Mixin, Allocator>& f, functionN<ResultType, Arg1, Arg2, ..., ArgN, Policy, Mixin, Allocator>& g); @@ -275,13 +269,9 @@ 

    -template<typename ResultType,
-         typename Arg1,
-	 typename Arg2,
-         ...
-	 typename ArgMAX_ARGS>
-void swap(function<ResultType, Arg1, Arg2, ..., ArgMAX_ARGS>& f,
-          function<ResultType, Arg1, Arg2, ..., ArgMAX_ARGS>& g);
+template<typename Signature, typename Policy, typename Mixin, typename Allocator>
+void swap(function<Signature, Policy, Mixin, Allocator>& f,
+          function<Signature, Policy, Mixin, Allocator>& g);