From 546bd00243e4dc27865e25eda84e936380665f6a Mon Sep 17 00:00:00 2001 From: nobody Date: Mon, 9 Sep 2002 21:58:16 +0000 Subject: [PATCH] This commit was manufactured by cvs2svn to create branch 'mpl_v2'. [SVN r15247] --- doc/faq.html | 44 -- doc/reference.html | 298 -------- doc/tutorial.html | 258 ------- example/bind1st.cpp | 38 - example/int_div.cpp | 32 - example/sum_avg.cpp | 44 -- include/boost/function.hpp | 900 ----------------------- include/boost/function/function0.hpp | 39 - include/boost/function/function1.hpp | 39 - include/boost/function/function10.hpp | 39 - include/boost/function/function2.hpp | 39 - include/boost/function/function3.hpp | 38 - include/boost/function/function4.hpp | 39 - include/boost/function/function5.hpp | 39 - include/boost/function/function6.hpp | 39 - include/boost/function/function7.hpp | 39 - include/boost/function/function8.hpp | 39 - include/boost/function/function9.hpp | 39 - include/boost/function/function_base.hpp | 347 --------- include/boost/function/gen_function_N.pl | 111 --- index.html | 132 ---- test/allocator_test.cpp | 88 --- test/deprecated_syntax_test.cpp | 645 ---------------- test/function_n_test.cpp | 645 ---------------- test/function_test.cpp | 710 ------------------ test/function_test_fail1.cpp | 35 - test/function_test_fail2.cpp | 34 - test/mixin_test.cpp | 60 -- test/policy_test.cpp | 47 -- test/regression.cfg | 14 - test/stateless_test.cpp | 47 -- 31 files changed, 4957 deletions(-) delete mode 100644 doc/faq.html delete mode 100644 doc/reference.html delete mode 100644 doc/tutorial.html delete mode 100644 example/bind1st.cpp delete mode 100644 example/int_div.cpp delete mode 100644 example/sum_avg.cpp delete mode 100644 include/boost/function.hpp delete mode 100644 include/boost/function/function0.hpp delete mode 100644 include/boost/function/function1.hpp delete mode 100644 include/boost/function/function10.hpp delete mode 100644 include/boost/function/function2.hpp delete mode 100644 include/boost/function/function3.hpp delete mode 100644 include/boost/function/function4.hpp delete mode 100644 include/boost/function/function5.hpp delete mode 100644 include/boost/function/function6.hpp delete mode 100644 include/boost/function/function7.hpp delete mode 100644 include/boost/function/function8.hpp delete mode 100644 include/boost/function/function9.hpp delete mode 100644 include/boost/function/function_base.hpp delete mode 100644 include/boost/function/gen_function_N.pl delete mode 100644 index.html delete mode 100644 test/allocator_test.cpp delete mode 100644 test/deprecated_syntax_test.cpp delete mode 100644 test/function_n_test.cpp delete mode 100644 test/function_test.cpp delete mode 100644 test/function_test_fail1.cpp delete mode 100644 test/function_test_fail2.cpp delete mode 100644 test/mixin_test.cpp delete mode 100644 test/policy_test.cpp delete mode 100644 test/regression.cfg delete mode 100644 test/stateless_test.cpp diff --git a/doc/faq.html b/doc/faq.html deleted file mode 100644 index 5b1e07e..0000000 --- a/doc/faq.html +++ /dev/null @@ -1,44 +0,0 @@ - - - - Boost.Function Frequently Asked Questions - - - -

boost::function Frequently Asked Questions

- -

Q: I see void pointers; is this [mess] type safe?

-

Yes, boost::function is type safe even though it uses void pointers and pointers to functions returning void and taking no arguments. Essentially, all type information is encoded in the functions that manage and invoke function pointers and function objects. Only these functions are instantiated with the exact type that is pointed to by the void pointer or pointer to void function. The reason that both are required is that one may cast between void pointers and object pointers safely or between different types of function pointers (provided you don't invoke a function pointer with the wrong type). - -

Q: Why are there workarounds for void returns? C++ allows them!

-

Void returns are permitted by the C++ standard, as in this code snippet: -

-void f();
-void g() { return f(); }
-
- -

One reason for not using void returns is that not all compilers support them. In fact, very few compilers seem to support this trivial feature. Additionally, boost::function is more flexible because it does not use void returns. Consider the following code: -

-int do_something(int);
-
-boost::function f;
-f = do_something;
-
-

This is a valid usage of boost::function because void returns are not used. With void returns, we would attempting to compile ill-formed code similar to: -

-int f();
-void g() { return f(); }
-
-

In essence, not using void returns allows boost::function to swallow a return value. This is consistent with allowing the user to assign and invoke functions and function objects with parameters that don't exactly match. - -

Q: Why (function) cloning?

-

In November and December of 2000, the issue of cloning vs. reference counting was debated at length and it was decided that cloning gave more predictable semantics. I won't rehash the discussion here, but if it cloning is incorrect for a particular application a reference-counting allocator could be used. - -

-
Doug Gregor
- - -Last modified: Wed Nov 7 15:11:52 EST 2001 - - - \ No newline at end of file diff --git a/doc/reference.html b/doc/reference.html deleted file mode 100644 index db9e205..0000000 --- a/doc/reference.html +++ /dev/null @@ -1,298 +0,0 @@ - - - - Boost.Function Reference Manual - - - - -

Boost.Function Reference Manual

- -

Header <boost/function.hpp> synopsis

-

Here MAX_ARGS is an implementation-defined constant that defines the maximum number of function arguments supported by Boost.Function and will be at least 10. The MAX_ARGS constant referred to in this document need not have any direct representation in the library. - -

-namespace boost {
-  class function_base
-  {
-    typedef implementation-defined safe_bool;
-    bool empty() const;
-    operator safe_bool() const;
-    safe_bool operator!() const;
-  };
-
-  // For N in [0, MAX_ARGS]
-  template<typename Signature,
-           typename Arg1,
-	   typename Arg2,
-           ...
-           typename ArgN,
-	   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; // Deprecated
-    typedef Mixin      mixin_type; // Deprecated
-    typedef Allocator  allocator_type;
-
-    typedef Arg1 argument_type;        // If N == 1
-
-    typedef Arg1 first_argument_type;  // If N == 2
-    typedef Arg2 second_argument_type; // If N == 2
-
-    typedef Arg1 arg1_type;
-    typedef Arg2 arg2_type;
-             .
-             .
-             .
-    typedef ArgN argN_type;
-
-    enum { arity = N };
-
-    // Construction
-    explicit functionN(const Mixin& = Mixin());
-    functionN(const functionN&);
-    template<typename F> functionN(F, const Mixin& = Mixin());
-    template<typename F> functionN(reference_wrapper<F>);
-    
-    // Assignment
-    functionN& operator=(const functionN&);
-    template<typename F> functionN& operator=(F);
-    template<typename F> functionN& operator=(reference_wrapper<F>);
-    void set(const functionN&); // Deprecated
-    template<typename F> void set(F); // Deprecated
-    void swap(functionN&);
-    void clear();
-
-    // Invocation
-    result_type operator()(Arg1 a1, Arg2 a2, ..., ArgN aN) const;
-  };
-
-  template<typename ResultType,
-           typename Arg1,
-	   typename Arg2,
-           ...
-	   typename ArgN,
-           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 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
-    function();
-    function(const function&);
-    function(const functionN<ResultType, Arg1, Arg2, ..., ArgN>&);
-    template<typename F> functionN(F);
-    
-    // Assignment
-    function& operator=(const function&);
-    function& operator=(const functionN<ResultType, Arg1, Arg2, ..., ArgN>&);
-    template<typename F> function& operator=(F);
-    void set(const function&); // Deprecated
-    void set(const functionN<ResultType, Arg1, Arg2, ..., ArgN>&); // Deprecated
-    template<typename F> void set(F); // Deprecated
-  };
-
-  template<typename Signature, typename Policy, typename Mixin, typename Allocator>
-  void swap(function<Signature, Policy, Mixin, Allocator>&,
-            function<Signature, Policy, Mixin, Allocator>&);
-}	   
-
- -

Definitions

-

-

- -

Class function_base

-

Class function_base is the common base class for all Boost.Function objects. Objects of type function_base may not be created directly. - -

bool empty() const -

- -

operator safe_bool() const -

- -

safe_bool operator!() const -

- -

Class template functionN

-

Class template functionN is actually a family of related classes function0, function1, etc., up to some implementation-defined maximum. In this context, N refers to the number of parameters and f refers to the implicit object parameter. - -

explicit functionN(const Mixin& = Mixin()); -

- -

functionN(const functionN& g); -

- -

template<typename F> functionN(F g, const Mixin& = Mixin()); -

- -

template<typename F> functionN(reference_wrapper<F> g); -

- -

functionN& operator=(const functionN& g); -

- -

template<typename F> functionN& operator=(F g); -

- -

template<typename F> functionN& operator=(reference_wrapper<F> g); -

- -

void set(const functionN& g); -

- -

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

- -

void swap(functionN& g); -

- -

void clear(); -

- -

result_type operator()(Arg1 a1, Arg2 a2, ..., ArgN aN) const; -

- -

Class template function

-

Class template function is a thin wrapper around the numbered class templates function0, function1, etc. It accepts up to MAX_ARGS arguments, but when passed N arguments it will derive from functionN specialized with the arguments it receives. - -

The semantics of all operations in class template function are equivalent to that of the underlying functionN object, although additional member functions are required to allow proper copy construction and copy assignment of function objects. - -

Operations

-

-

-template<typename ResultType,
-         typename Arg1,
-	 typename Arg2,
-         ...
-	 typename ArgN,
-         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);
-
- - -

-

-template<typename Signature, typename Policy, typename Mixin, typename Allocator>
-void swap(function<Signature, Policy, Mixin, Allocator>& f,
-          function<Signature, Policy, Mixin, Allocator>& g);
-
- - -
-

[1] On compilers not supporting void returns, when the ReturnType is void, the result_type of a Boost.Function object is implementation-defined. -

-
Douglas Gregor
- - -Last modified: Fri Sep 6 14:46:50 EDT 2002 - - - diff --git a/doc/tutorial.html b/doc/tutorial.html deleted file mode 100644 index e875058..0000000 --- a/doc/tutorial.html +++ /dev/null @@ -1,258 +0,0 @@ - - - - Boost.Function Tutorial - - - - -

Boost.Function Tutorial

- -

Boost.Function has two syntactical forms: the preferred form and the compatibility form. The preferred form fits more closely with the C++ language and reduces the number of separate template parameters that need to be considered, often improving readability; however, the preferred form is not supported on all platforms due to compiler bugs. The compatible form will work on all compilers supported by Boost.Function. Consult the table below to determine which syntactic form to use for your compiler. - -

- - - - - - -
Preferred SyntaxCompatible Syntax
-
    -
  • GNU C++ 2.95.x, 3.0.x, 3.1.x
    • -
  • Comeau C++ 4.2.45.2
    • -
  • SGI MIPSpro 7.3.0
    • -
  • Intel C++ 5.0, 6.0
    • -
  • Compaq's cxx 6.2
    • -
- 		-
    -
  • Microsoft Visual C++ 6.0, 7.0
    • -
  • Borland C++ 5.5.1
    • -
  • Sun WorkShop 6 update 2 C++ 5.3
    • -
  • Metrowerks CodeWarrior 8.1
    • -
-
-
- -

If your compiler does not appear in this list, please try the preferred syntax and report your results to the Boost list so that we can keep this table up-to-date. - -

Basic Usage

-

A function wrapper is defined simply by instantiating the function class template with the desired return type and argument types, formulated as a C++ function type. Any number of arguments may be supplied, up to some implementation-defined limit (10 is the default maximum). The following declares a function object wrapper f that takes two int parameters and returns a float: -

- - - - - - -
Preferred SyntaxCompatible Syntax
- 
-boost::function<float (int x, int y)> f;
-
- 		- 
-boost::function2<float, int, int> f;
-
-
-
- -

By default, function object wrappers are empty, so we can create a -function object to assign to f: - -

-struct int_div { 
-  float operator()(int x, int y) const { return ((float)x)/y; }; 
-};
-
-f = int_div();
-
- -

Now we can use f to execute the underlying function object -int_div: -

-std::cout << f(5, 3) >> std::endl;
-
- -

We are free to assign any compatible function object to f. If int_div had been declared to take two long operands, -the implicit conversions would have been applied to the arguments without any user interference. The only limit on the types of arguments is that they be CopyConstructible, so we can even use references and arrays: -

- - - - - - -
Preferred SyntaxCompatible Syntax
- 
-boost::function<void (int values[], int n, int& sum, float& avg)> sum_avg;
-
- 		- 
-boost::function4<void, int[], int, int&, float> sum_avg;
-
-
-
- -
-void do_sum_avg(int values[], int n, int& sum, float& avg)
-{
-  sum = 0;
-  for (int i = 0; i < n; i++)
-    sum += values[i];
-  avg = (float)sum / n;
-}
-
-sum_avg = &do_sum_avg;
-
- -

Invoking a function object wrapper that does not actually contain a function object is a precondition violation, much like trying to call through a null function pointer. We can check for an empty function object wrapper by querying its empty() method or, more succinctly, by using it in a boolean context: if it evaluates true, it contains a function object target, i.e., -

-if (f)
-  std::cout << f(5, 3) << std::endl;
-else
-  std::cout << "f has no target, so it is unsafe to call" << std::endl;
-
- -

We can clear out a function target using the clear() member function. - -

Free functions

-

Free function pointers can be considered singleton function objects with const function call operators, and can therefore be directly used with the function object wrappers: -

-  float mul_ints(int x, int y) { return ((float)x) * y; }
-  f = &mul_ints;
-
- -

Note that the & isn't really necessary unless you happen to be using Microsoft Visual C++ version 6. - -

Member functions

- -

In many systems, callbacks often call to member functions of a particular -object. This is often referred to as "argument binding", and is beyond the scope of Boost.Function. The use of member functions directly, however, is supported, so the following code is valid: - -

- - - - - - -
Preferred SyntaxCompatible Syntax
-
-struct X {
-  int foo(int);
-};
-
-boost::function<int (X*, int)> f;
-
-f = &X::foo;
-  
-X x;
-f(&x, 5);
-
- 		-
-struct X {
-  int foo(int);
-};
-
-boost::function2<int, X*, int> f;
-
-f = &X::foo;
-  
-X x;
-f(&x, 5);
-
-
-
- -

Several libraries exist that support argument binding. Three such libraries are summarized below: -

 - -

References to Functions

-

In some cases it is expensive (or semantically incorrect) to have -Boost.Function clone a function object. In such cases, it is possible -to request that Boost.Function keep only a reference to the actual -function object. This is done using the ref and cref functions to wrap a -reference to a function object: -

- - - - - - -
Preferred SyntaxCompatible Syntax
-
-  stateful_type a_function_object;
-  boost::function<int (int)> f;
-  f = ref(a_function_object);
-
-  boost::function<int (int)> f2(f);
-
- 		-
-  stateful_type a_function_object;
-  boost::function1<int, int> f;
-  f = ref(a_function_object);
-
-  boost::function1<int, int> f2(f);
-
-
-
- -Here, f will not make a copy of -a_function_object, nor will f2 when it is -targeted to f's reference to -a_function_object. Additionally, when using references to -function objects, Boost.Function will not throw exceptions during - assignment or construction. - -
-
Douglas Gregor
- - -Last modified: Mon Aug 5 11:07:17 EDT 2002 - - - diff --git a/example/bind1st.cpp b/example/bind1st.cpp deleted file mode 100644 index 875481a..0000000 --- a/example/bind1st.cpp +++ /dev/null @@ -1,38 +0,0 @@ -// Boost.Function library examples - -// Copyright (C) 2001 Doug Gregor (gregod@cs.rpi.edu) -// -// Permission to copy, use, sell and distribute this software is granted -// provided this copyright notice appears in all copies. -// Permission to modify the code and to distribute modified code is granted -// provided this copyright notice appears in all copies, and a notice -// that the code was modified is included with the copyright notice. -// -// This software is provided "as is" without express or implied warranty, -// and with no claim as to its suitability for any purpose. - -// For more information, see http://www.boost.org - -#include -#include -#include - -struct X { - X(int val) : value(val) {} - - int foo(int x) { return x * value; } - - int value; -}; - - -int -main() -{ - boost::function f; - X x(7); - f = std::bind1st(std::mem_fun(&X::foo), &x); - - std::cout << f(5) << std::endl; // Call x.foo(5) - return 0; -} diff --git a/example/int_div.cpp b/example/int_div.cpp deleted file mode 100644 index b98cc36..0000000 --- a/example/int_div.cpp +++ /dev/null @@ -1,32 +0,0 @@ -// Boost.Function library examples - -// Copyright (C) 2001 Doug Gregor (gregod@cs.rpi.edu) -// -// Permission to copy, use, sell and distribute this software is granted -// provided this copyright notice appears in all copies. -// Permission to modify the code and to distribute modified code is granted -// provided this copyright notice appears in all copies, and a notice -// that the code was modified is included with the copyright notice. -// -// This software is provided "as is" without express or implied warranty, -// and with no claim as to its suitability for any purpose. - -// For more information, see http://www.boost.org - -#include -#include - -struct int_div { - float operator()(int x, int y) const { return ((float)x)/y; }; -}; - -int -main() -{ - boost::function f; - f = int_div(); - - std::cout << f(5, 3) << std::endl; // 1.66667 - - return 0; -} diff --git a/example/sum_avg.cpp b/example/sum_avg.cpp deleted file mode 100644 index 413ac75..0000000 --- a/example/sum_avg.cpp +++ /dev/null @@ -1,44 +0,0 @@ -// Boost.Function library examples - -// Copyright (C) 2001 Doug Gregor (gregod@cs.rpi.edu) -// -// Permission to copy, use, sell and distribute this software is granted -// provided this copyright notice appears in all copies. -// Permission to modify the code and to distribute modified code is granted -// provided this copyright notice appears in all copies, and a notice -// that the code was modified is included with the copyright notice. -// -// This software is provided "as is" without express or implied warranty, -// and with no claim as to its suitability for any purpose. - -// For more information, see http://www.boost.org - -#include -#include - -void do_sum_avg(int values[], int n, int& sum, float& avg) -{ - sum = 0; - for (int i = 0; i < n; i++) - sum += values[i]; - avg = (float)sum / n; -} - -int -main() -{ - // The second parameter should be int[], but some compilers (e.g., GCC) - // complain about this - boost::function sum_avg; - - sum_avg = &do_sum_avg; - - int values[5] = { 1, 1, 2, 3, 5 }; - int sum; - float avg; - sum_avg(values, 5, sum, avg); - - std::cout << "sum = " << sum << std::endl; - std::cout << "avg = " << avg << std::endl; - return 0; -} diff --git a/include/boost/function.hpp b/include/boost/function.hpp deleted file mode 100644 index 53cdb1a..0000000 --- a/include/boost/function.hpp +++ /dev/null @@ -1,900 +0,0 @@ -// Boost.Function library - -// Copyright (C) 2001, 2002 Doug Gregor (gregod@cs.rpi.edu) -// -// Permission to copy, use, sell and distribute this software is granted -// provided this copyright notice appears in all copies. -// Permission to modify the code and to distribute modified code is granted -// provided this copyright notice appears in all copies, and a notice -// that the code was modified is included with the copyright notice. -// -// This software is provided "as is" without express or implied warranty, -// and with no claim as to its suitability for any purpose. - -// For more information, see http://www.boost.org - -// William Kempf, Jesse Jones and Karl Nelson were all very helpful in the -// design of this library. - -#ifndef BOOST_FUNCTION_HPP -#define BOOST_FUNCTION_HPP - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -// Don't compile any of this code if we've asked not to include the deprecated -// syntax and we don't have partial specialization, because none of this code -// can work. -#if !defined (BOOST_FUNCTION_NO_DEPRECATED) || !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) - -namespace boost { - namespace detail { - namespace function { - // Choose the appropriate underlying implementation - template struct real_get_function_impl {}; - - template<> - struct real_get_function_impl<0> - { - template< - typename R, - typename T1, - typename T2, - typename T3, - typename T4, - typename T5, - typename T6, - typename T7, - typename T8, - typename T9, - typename T10, -#ifndef BOOST_FUNCTION_NO_DEPRECATED - typename Policy, - typename Mixin, -#endif // ndef BOOST_FUNCTION_NO_DEPRECATED - typename Allocator - > - struct params - { - typedef function0 type; - }; - }; - - template<> - struct real_get_function_impl<1> - { - template< - typename R, - typename T1, - typename T2, - typename T3, - typename T4, - typename T5, - typename T6, - typename T7, - typename T8, - typename T9, - typename T10, -#ifndef BOOST_FUNCTION_NO_DEPRECATED - typename Policy, - typename Mixin, -#endif // ndef BOOST_FUNCTION_NO_DEPRECATED - typename Allocator - > - struct params - { - typedef function1 type; - }; - }; - - template<> - struct real_get_function_impl<2> - { - template< - typename R, - typename T1, - typename T2, - typename T3, - typename T4, - typename T5, - typename T6, - typename T7, - typename T8, - typename T9, - typename T10, -#ifndef BOOST_FUNCTION_NO_DEPRECATED - typename Policy, - typename Mixin, -#endif // ndef BOOST_FUNCTION_NO_DEPRECATED - typename Allocator - > - struct params - { - typedef function2 type; - }; - }; - - template<> - struct real_get_function_impl<3> - { - template< - typename R, - typename T1, - typename T2, - typename T3, - typename T4, - typename T5, - typename T6, - typename T7, - typename T8, - typename T9, - typename T10, -#ifndef BOOST_FUNCTION_NO_DEPRECATED - typename Policy, - typename Mixin, -#endif // ndef BOOST_FUNCTION_NO_DEPRECATED - typename Allocator - > - struct params - { - typedef function3 type; - }; - }; - - template<> - struct real_get_function_impl<4> - { - template< - typename R, - typename T1, - typename T2, - typename T3, - typename T4, - typename T5, - typename T6, - typename T7, - typename T8, - typename T9, - typename T10, -#ifndef BOOST_FUNCTION_NO_DEPRECATED - typename Policy, - typename Mixin, -#endif // ndef BOOST_FUNCTION_NO_DEPRECATED - typename Allocator - > - struct params - { - typedef function4 type; - }; - }; - - template<> - struct real_get_function_impl<5> - { - template< - typename R, - typename T1, - typename T2, - typename T3, - typename T4, - typename T5, - typename T6, - typename T7, - typename T8, - typename T9, - typename T10, -#ifndef BOOST_FUNCTION_NO_DEPRECATED - typename Policy, - typename Mixin, -#endif // ndef BOOST_FUNCTION_NO_DEPRECATED - typename Allocator - > - struct params - { - typedef function5 - type; - }; - }; - - template<> - struct real_get_function_impl<6> - { - template< - typename R, - typename T1, - typename T2, - typename T3, - typename T4, - typename T5, - typename T6, - typename T7, - typename T8, - typename T9, - typename T10, -#ifndef BOOST_FUNCTION_NO_DEPRECATED - typename Policy, - typename Mixin, -#endif // ndef BOOST_FUNCTION_NO_DEPRECATED - typename Allocator - > - struct params - { - typedef function6 - type; - }; - }; - - template<> - struct real_get_function_impl<7> - { - template< - typename R, - typename T1, - typename T2, - typename T3, - typename T4, - typename T5, - typename T6, - typename T7, - typename T8, - typename T9, - typename T10, -#ifndef BOOST_FUNCTION_NO_DEPRECATED - typename Policy, - typename Mixin, -#endif // ndef BOOST_FUNCTION_NO_DEPRECATED - typename Allocator - > - struct params - { - typedef function7 type; - }; - }; - - template<> - struct real_get_function_impl<8> - { - template< - typename R, - typename T1, - typename T2, - typename T3, - typename T4, - typename T5, - typename T6, - typename T7, - typename T8, - typename T9, - typename T10, -#ifndef BOOST_FUNCTION_NO_DEPRECATED - typename Policy, - typename Mixin, -#endif // ndef BOOST_FUNCTION_NO_DEPRECATED - typename Allocator - > - struct params - { - typedef function8 type; - }; - }; - - template<> - struct real_get_function_impl<9> - { - template< - typename R, - typename T1, - typename T2, - typename T3, - typename T4, - typename T5, - typename T6, - typename T7, - typename T8, - typename T9, - typename T10, -#ifndef BOOST_FUNCTION_NO_DEPRECATED - typename Policy, - typename Mixin, -#endif // ndef BOOST_FUNCTION_NO_DEPRECATED - typename Allocator - > - struct params - { - typedef function9 type; - }; - }; - - template<> - struct real_get_function_impl<10> - { - template< - typename R, - typename T1, - typename T2, - typename T3, - typename T4, - typename T5, - typename T6, - typename T7, - typename T8, - typename T9, - typename T10, -#ifndef BOOST_FUNCTION_NO_DEPRECATED - typename Policy, - typename Mixin, -#endif // ndef BOOST_FUNCTION_NO_DEPRECATED - typename Allocator - > - struct params - { - typedef function10 type; - }; - }; - -#ifndef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION - template - struct get_arg1_type - { - typedef unusable type; - }; - - template - struct get_arg1_type - { - typedef typename Traits::arg1_type type; - }; - - template - struct get_arg2_type - { - typedef unusable type; - }; - - template - struct get_arg2_type - { - typedef typename Traits::arg2_type type; - }; - - template - struct get_arg3_type - { - typedef unusable type; - }; - - template - struct get_arg3_type - { - typedef typename Traits::arg3_type type; - }; - - template - struct get_arg4_type - { - typedef unusable type; - }; - - template - struct get_arg4_type - { - typedef typename Traits::arg4_type type; - }; - - template - struct get_arg5_type - { - typedef unusable type; - }; - - template - struct get_arg5_type - { - typedef typename Traits::arg5_type type; - }; - - template - struct get_arg6_type - { - typedef unusable type; - }; - - template - struct get_arg6_type - { - typedef typename Traits::arg6_type type; - }; - - template - struct get_arg7_type - { - typedef unusable type; - }; - - template - struct get_arg7_type - { - typedef typename Traits::arg7_type type; - }; - - template - struct get_arg8_type - { - typedef unusable type; - }; - - template - struct get_arg8_type - { - typedef typename Traits::arg8_type type; - }; - - template - struct get_arg9_type - { - typedef unusable type; - }; - - template - struct get_arg9_type - { - typedef typename Traits::arg9_type type; - }; - - template - struct get_arg10_type - { - typedef unusable type; - }; - - template - struct get_arg10_type - { - typedef typename Traits::arg10_type type; - }; - - template - struct gte - { - BOOST_STATIC_CONSTANT(bool, value = (X >= Y)); - }; - - template - struct maybe_decode_function_args - { - typedef function_traits traits; - - typedef typename traits::result_type R; - typedef typename get_arg1_type<(gte<(traits::arity), 1>::value), - traits>::type T1; - typedef typename get_arg2_type<(gte<(traits::arity), 2>::value), - traits>::type T2; - typedef typename get_arg3_type<(gte<(traits::arity), 3>::value), - traits>::type T3; - typedef typename get_arg4_type<(gte<(traits::arity), 4>::value), - traits>::type T4; - typedef typename get_arg5_type<(gte<(traits::arity), 5>::value), - traits>::type T5; - typedef typename get_arg6_type<(gte<(traits::arity), 6>::value), - traits>::type T6; - typedef typename get_arg7_type<(gte<(traits::arity), 7>::value), - traits>::type T7; - typedef typename get_arg8_type<(gte<(traits::arity), 8>::value), - traits>::type T8; - typedef typename get_arg9_type<(gte<(traits::arity), 9>::value), - traits>::type T9; - typedef typename get_arg10_type<(gte<(traits::arity), 10>::value), - traits>::type T10; - -#ifndef BOOST_FUNCTION_NO_DEPRECATED - typedef typename ct_if<(is_same::value), - empty_function_policy, - InT1>::type Policy; - typedef typename ct_if<(is_same::value), - empty_function_mixin, - InT2>::type Mixin; - typedef typename ct_if<(is_same::value), - std::allocator, - InT3>::type Allocator; -#else - typedef typename ct_if<(is_same::value), - std::allocator, - InT1>::type Allocator; -#endif // BOOST_FUNCTION_NO_DEPRECATED - }; - -#ifndef BOOST_FUNCTION_NO_DEPRECATED - template - struct maybe_decode_function_args - { - // Not a function, so just map the types directly - typedef InR R; - typedef InT1 T1; - typedef InT2 T2; - typedef InT3 T3; - typedef InT4 T4; - typedef InT5 T5; - typedef InT6 T6; - typedef InT7 T7; - typedef InT8 T8; - typedef InT9 T9; - typedef InT10 T10; -#ifndef BOOST_FUNCTION_NO_DEPRECATED - typedef InPolicy Policy; - typedef InMixin Mixin; -#endif // ndef BOOST_FUNCTION_NO_DEPRECATED - typedef InAllocator Allocator; - - }; -#endif // ndef BOOST_FUNCTION_NO_DEPRECATED - -#endif // ndef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION - - template< - typename InR, - typename InT1, - typename InT2, - typename InT3, - typename InT4, - typename InT5, - typename InT6, - typename InT7, - typename InT8, - typename InT9, - typename InT10, - typename InPolicy = empty_function_policy, - typename InMixin = empty_function_mixin, - typename InAllocator = std::allocator - > - struct get_function_impl - { -#ifndef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION - typedef maybe_decode_function_args<(is_function::value), - InR, InT1, InT2, InT3, InT4, InT5, - InT6, InT7, InT8, InT9, InT10, -#ifndef BOOST_FUNCTION_NO_DEPRECATED - InPolicy, InMixin, -#endif // ndef BOOST_FUNCTION_NO_DEPRECATED - InAllocator> decoder; - typedef typename decoder::R R; - typedef typename decoder::T1 T1; - typedef typename decoder::T2 T2; - typedef typename decoder::T3 T3; - typedef typename decoder::T4 T4; - typedef typename decoder::T5 T5; - typedef typename decoder::T6 T6; - typedef typename decoder::T7 T7; - typedef typename decoder::T8 T8; - typedef typename decoder::T9 T9; - typedef typename decoder::T10 T10; -#ifndef BOOST_FUNCTION_NO_DEPRECATED - typedef typename decoder::Policy Policy; - typedef typename decoder::Mixin Mixin; -#endif // ndef BOOST_FUNCTION_NO_DEPRECATED - typedef typename decoder::Allocator Allocator; -#else - typedef InR R; - typedef InT1 T1; - typedef InT2 T2; - typedef InT3 T3; - typedef InT4 T4; - typedef InT5 T5; - typedef InT6 T6; - typedef InT7 T7; - typedef InT8 T8; - typedef InT9 T9; - typedef InT10 T10; - typedef InPolicy Policy; - typedef InMixin Mixin; - typedef InAllocator Allocator; -#endif // def BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION - - typedef typename real_get_function_impl< - (count_used_args::value) - >::template params::type - type; - }; - -#ifndef BOOST_FUNCTION_NO_DEPRECATED - template< - typename InR, - typename InT1, - typename InT2, - typename InT3, - typename InT4, - typename InT5, - typename InT6, - typename InT7, - typename InT8, - typename InT9, - typename InT10, - typename InMyPolicy = empty_function_policy, - typename InMyMixin = empty_function_mixin, - typename InMyAllocator = std::allocator - > - class function_traits_builder - { - typedef get_function_impl - impl; - - typedef typename impl::R MyR; - typedef typename impl::T1 MyT1; - typedef typename impl::T2 MyT2; - typedef typename impl::T3 MyT3; - typedef typename impl::T4 MyT4; - typedef typename impl::T5 MyT5; - typedef typename impl::T6 MyT6; - typedef typename impl::T7 MyT7; - typedef typename impl::T8 MyT8; - typedef typename impl::T9 MyT9; - typedef typename impl::T10 MyT10; - typedef typename impl::Policy MyPolicy; - typedef typename impl::Mixin MyMixin; - typedef typename impl::Allocator MyAllocator; - - public: - typedef typename impl::type type; - typedef MyPolicy policy_type; - typedef MyMixin mixin_type; - typedef MyAllocator allocator_type; - -#ifndef BOOST_NO_DEPENDENT_NESTED_DERIVATIONS - template - struct policy : - public function_traits_builder {}; - - template - struct mixin : - public function_traits_builder {}; - - template - struct allocator : - public function_traits_builder {}; -#else - template - struct policy - { - typedef typename function_traits_builder::type - type; - }; - - template - struct mixin - { - typedef typename function_traits_builder::type - type; - }; - - template - struct allocator - { - typedef typename function_traits_builder::type - type; - }; -#endif // ndef NO_DEPENDENT_NESTED_DERIVATIONS - }; -#endif // ndef BOOST_FUNCTION_NO_DEPRECATED - } // end namespace function - } // end namespace detail - - template< - typename R, - typename T1 = detail::function::unusable, - typename T2 = detail::function::unusable, - typename T3 = detail::function::unusable, - typename T4 = detail::function::unusable, - typename T5 = detail::function::unusable, - typename T6 = detail::function::unusable, - typename T7 = detail::function::unusable, - typename T8 = detail::function::unusable, - typename T9 = detail::function::unusable, - typename T10 = detail::function::unusable - > - class function : - public detail::function::get_function_impl::type -#ifndef BOOST_FUNCTION_NO_DEPRECATED - , public detail::function::function_traits_builder -#endif // ndef BOOST_FUNCTION_NO_DEPRECATED - { - typedef typename detail::function::get_function_impl::type - base_type; - - public: -#ifndef BOOST_FUNCTION_NO_DEPRECATED - typedef typename base_type::policy_type policy_type; - typedef typename base_type::mixin_type mixin_type; -#endif // ndef BOOST_FUNCTION_NO_DEPRECATED - typedef typename base_type::allocator_type allocator_type; - typedef function self_type; - - function() : base_type() {} - - template - function(Functor BOOST_FUNCTION_TARGET_FIX(const &) f) : base_type(f) {} - - function(const self_type& f) : base_type(static_cast(f)){} - - template - self_type& operator=(Functor BOOST_FUNCTION_TARGET_FIX(const &) f) - { - self_type(f).swap(*this); - return *this; - } - - self_type& operator=(const base_type& f) - { - self_type(f).swap(*this); - return *this; - } - - self_type& operator=(const self_type& f) - { - self_type(f).swap(*this); - return *this; - } - -#ifndef BOOST_FUNCTION_NO_DEPRECATED - template - BOOST_FUNCTION_DEPRECATED_PRE - void set(Functor BOOST_FUNCTION_TARGET_FIX(const &) f) - { - BOOST_FUNCTION_DEPRECATED_INNER - self_type(f).swap(*this); - } - - BOOST_FUNCTION_DEPRECATED_PRE - void set(const base_type& f) - { - BOOST_FUNCTION_DEPRECATED_INNER - self_type(f).swap(*this); - } - - BOOST_FUNCTION_DEPRECATED_PRE - void set(const self_type& f) - { - BOOST_FUNCTION_DEPRECATED_INNER - self_type(f).swap(*this); - } -#endif // ndef BOOST_FUNCTION_NO_DEPRECATED - }; - - template - inline void swap(function& f1, - function& f2) - { - f1.swap(f2); - } -} // end namespace boost - -#endif // !no deprecated || !no partial specialization - -#endif diff --git a/include/boost/function/function0.hpp b/include/boost/function/function0.hpp deleted file mode 100644 index 8f37ae6..0000000 --- a/include/boost/function/function0.hpp +++ /dev/null @@ -1,39 +0,0 @@ -// Boost.Function library -// -// Copyright (C) 2001 Doug Gregor (gregod@cs.rpi.edu) -// -// Permission to copy, use, sell and distribute this software is granted -// provided this copyright notice appears in all copies. -// Permission to modify the code and to distribute modified code is granted -// provided this copyright notice appears in all copies, and a notice -// that the code was modified is included with the copyright notice. -// -// This software is provided "as is" without express or implied warranty, -// and with no claim as to its suitability for any purpose. - -// For more information, see http://www.boost.org - -#ifndef BOOST_FUNCTION_FUNCTION0_HEADER -#define BOOST_FUNCTION_FUNCTION0_HEADER - -#define BOOST_FUNCTION_NUM_ARGS 0 -#define BOOST_FUNCTION_TEMPLATE_PARMS -#define BOOST_FUNCTION_TEMPLATE_ARGS -#define BOOST_FUNCTION_PARMS -#define BOOST_FUNCTION_ARGS -#define BOOST_FUNCTION_NOT_0_PARMS -#define BOOST_FUNCTION_NOT_0_ARGS -#define BOOST_FUNCTION_ARG_TYPES - -#include - -#undef BOOST_FUNCTION_ARG_TYPES -#undef BOOST_FUNCTION_NOT_0_ARGS -#undef BOOST_FUNCTION_NOT_0_PARMS -#undef BOOST_FUNCTION_ARGS -#undef BOOST_FUNCTION_PARMS -#undef BOOST_FUNCTION_TEMPLATE_ARGS -#undef BOOST_FUNCTION_TEMPLATE_PARMS -#undef BOOST_FUNCTION_NUM_ARGS - -#endif // BOOST_FUNCTION_FUNCTION0_HEADER diff --git a/include/boost/function/function1.hpp b/include/boost/function/function1.hpp deleted file mode 100644 index 7cf9b23..0000000 --- a/include/boost/function/function1.hpp +++ /dev/null @@ -1,39 +0,0 @@ -// Boost.Function library -// -// Copyright (C) 2001 Doug Gregor (gregod@cs.rpi.edu) -// -// Permission to copy, use, sell and distribute this software is granted -// provided this copyright notice appears in all copies. -// Permission to modify the code and to distribute modified code is granted -// provided this copyright notice appears in all copies, and a notice -// that the code was modified is included with the copyright notice. -// -// This software is provided "as is" without express or implied warranty, -// and with no claim as to its suitability for any purpose. - -// For more information, see http://www.boost.org - -#ifndef BOOST_FUNCTION_FUNCTION1_HEADER -#define BOOST_FUNCTION_FUNCTION1_HEADER - -#define BOOST_FUNCTION_NUM_ARGS 1 -#define BOOST_FUNCTION_TEMPLATE_PARMS typename T0 -#define BOOST_FUNCTION_TEMPLATE_ARGS T0 -#define BOOST_FUNCTION_PARMS T0 a0 -#define BOOST_FUNCTION_ARGS a0 -#define BOOST_FUNCTION_NOT_0_PARMS -#define BOOST_FUNCTION_NOT_0_ARGS -#define BOOST_FUNCTION_ARG_TYPES typedef T0 arg1_type; - -#include - -#undef BOOST_FUNCTION_ARG_TYPES -#undef BOOST_FUNCTION_NOT_0_ARGS -#undef BOOST_FUNCTION_NOT_0_PARMS -#undef BOOST_FUNCTION_ARGS -#undef BOOST_FUNCTION_PARMS -#undef BOOST_FUNCTION_TEMPLATE_ARGS -#undef BOOST_FUNCTION_TEMPLATE_PARMS -#undef BOOST_FUNCTION_NUM_ARGS - -#endif // BOOST_FUNCTION_FUNCTION1_HEADER diff --git a/include/boost/function/function10.hpp b/include/boost/function/function10.hpp deleted file mode 100644 index afdb5b1..0000000 --- a/include/boost/function/function10.hpp +++ /dev/null @@ -1,39 +0,0 @@ -// Boost.Function library -// -// Copyright (C) 2001 Doug Gregor (gregod@cs.rpi.edu) -// -// Permission to copy, use, sell and distribute this software is granted -// provided this copyright notice appears in all copies. -// Permission to modify the code and to distribute modified code is granted -// provided this copyright notice appears in all copies, and a notice -// that the code was modified is included with the copyright notice. -// -// This software is provided "as is" without express or implied warranty, -// and with no claim as to its suitability for any purpose. - -// For more information, see http://www.boost.org - -#ifndef BOOST_FUNCTION_FUNCTION10_HEADER -#define BOOST_FUNCTION_FUNCTION10_HEADER - -#define BOOST_FUNCTION_NUM_ARGS 10 -#define BOOST_FUNCTION_TEMPLATE_PARMS typename T0, typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8, typename T9 -#define BOOST_FUNCTION_TEMPLATE_ARGS T0, T1, T2, T3, T4, T5, T6, T7, T8, T9 -#define BOOST_FUNCTION_PARMS T0 a0, T1 a1, T2 a2, T3 a3, T4 a4, T5 a5, T6 a6, T7 a7, T8 a8, T9 a9 -#define BOOST_FUNCTION_ARGS a0, a1, a2, a3, a4, a5, a6, a7, a8, a9 -#define BOOST_FUNCTION_NOT_0_PARMS T1 a1, T2 a2, T3 a3, T4 a4, T5 a5, T6 a6, T7 a7, T8 a8, T9 a9 -#define BOOST_FUNCTION_NOT_0_ARGS a1, a2, a3, a4, a5, a6, a7, a8, a9 -#define BOOST_FUNCTION_ARG_TYPES typedef T0 arg1_type; typedef T1 arg2_type; typedef T2 arg3_type; typedef T3 arg4_type; typedef T4 arg5_type; typedef T5 arg6_type; typedef T6 arg7_type; typedef T7 arg8_type; typedef T8 arg9_type; typedef T9 arg10_type; - -#include - -#undef BOOST_FUNCTION_ARG_TYPES -#undef BOOST_FUNCTION_NOT_0_ARGS -#undef BOOST_FUNCTION_NOT_0_PARMS -#undef BOOST_FUNCTION_ARGS -#undef BOOST_FUNCTION_PARMS -#undef BOOST_FUNCTION_TEMPLATE_ARGS -#undef BOOST_FUNCTION_TEMPLATE_PARMS -#undef BOOST_FUNCTION_NUM_ARGS - -#endif // BOOST_FUNCTION_FUNCTION10_HEADER diff --git a/include/boost/function/function2.hpp b/include/boost/function/function2.hpp deleted file mode 100644 index 31a5397..0000000 --- a/include/boost/function/function2.hpp +++ /dev/null @@ -1,39 +0,0 @@ -// Boost.Function library -// -// Copyright (C) 2001 Doug Gregor (gregod@cs.rpi.edu) -// -// Permission to copy, use, sell and distribute this software is granted -// provided this copyright notice appears in all copies. -// Permission to modify the code and to distribute modified code is granted -// provided this copyright notice appears in all copies, and a notice -// that the code was modified is included with the copyright notice. -// -// This software is provided "as is" without express or implied warranty, -// and with no claim as to its suitability for any purpose. - -// For more information, see http://www.boost.org - -#ifndef BOOST_FUNCTION_FUNCTION2_HEADER -#define BOOST_FUNCTION_FUNCTION2_HEADER - -#define BOOST_FUNCTION_NUM_ARGS 2 -#define BOOST_FUNCTION_TEMPLATE_PARMS typename T0, typename T1 -#define BOOST_FUNCTION_TEMPLATE_ARGS T0, T1 -#define BOOST_FUNCTION_PARMS T0 a0, T1 a1 -#define BOOST_FUNCTION_ARGS a0, a1 -#define BOOST_FUNCTION_NOT_0_PARMS T1 a1 -#define BOOST_FUNCTION_NOT_0_ARGS a1 -#define BOOST_FUNCTION_ARG_TYPES typedef T0 arg1_type; typedef T1 arg2_type; - -#include - -#undef BOOST_FUNCTION_ARG_TYPES -#undef BOOST_FUNCTION_NOT_0_ARGS -#undef BOOST_FUNCTION_NOT_0_PARMS -#undef BOOST_FUNCTION_ARGS -#undef BOOST_FUNCTION_PARMS -#undef BOOST_FUNCTION_TEMPLATE_ARGS -#undef BOOST_FUNCTION_TEMPLATE_PARMS -#undef BOOST_FUNCTION_NUM_ARGS - -#endif // BOOST_FUNCTION_FUNCTION2_HEADER diff --git a/include/boost/function/function3.hpp b/include/boost/function/function3.hpp deleted file mode 100644 index 38c64cb..0000000 --- a/include/boost/function/function3.hpp +++ /dev/null @@ -1,38 +0,0 @@ -// Boost.Function library -// -// Copyright (C) 2001 Doug Gregor (gregod@cs.rpi.edu) -// -// Permission to copy, use, sell and distribute this software is granted -// provided this copyright notice appears in all copies. -// Permission to modify the code and to distribute modified code is granted -// provided this copyright notice appears in all copies, and a notice -// that the code was modified is included with the copyright notice. -// -// This software is provided "as is" without express or implied warranty, -// and with no claim as to its suitability for any purpose. - -// For more information, see http://www.boost.org - -#ifndef BOOST_FUNCTION_FUNCTION3_HEADER -#define BOOST_FUNCTION_FUNCTION3_HEADER - -#define BOOST_FUNCTION_NUM_ARGS 3 -#define BOOST_FUNCTION_TEMPLATE_PARMS typename T0, typename T1, typename T2 -#define BOOST_FUNCTION_TEMPLATE_ARGS T0, T1, T2 -#define BOOST_FUNCTION_PARMS T0 a0, T1 a1, T2 a2 -#define BOOST_FUNCTION_ARGS a0, a1, a2 -#define BOOST_FUNCTION_NOT_0_PARMS T1 a1, T2 a2 -#define BOOST_FUNCTION_NOT_0_ARGS a1, a2 -#define BOOST_FUNCTION_ARG_TYPES typedef T0 arg1_type; typedef T1 arg2_type; typedef T2 arg3_type; - -#include -#undef BOOST_FUNCTION_ARG_TYPES -#undef BOOST_FUNCTION_NOT_0_ARGS -#undef BOOST_FUNCTION_NOT_0_PARMS -#undef BOOST_FUNCTION_ARGS -#undef BOOST_FUNCTION_PARMS -#undef BOOST_FUNCTION_TEMPLATE_ARGS -#undef BOOST_FUNCTION_TEMPLATE_PARMS -#undef BOOST_FUNCTION_NUM_ARGS - -#endif // BOOST_FUNCTION_FUNCTION3_HEADER diff --git a/include/boost/function/function4.hpp b/include/boost/function/function4.hpp deleted file mode 100644 index 7049964..0000000 --- a/include/boost/function/function4.hpp +++ /dev/null @@ -1,39 +0,0 @@ -// Boost.Function library -// -// Copyright (C) 2001 Doug Gregor (gregod@cs.rpi.edu) -// -// Permission to copy, use, sell and distribute this software is granted -// provided this copyright notice appears in all copies. -// Permission to modify the code and to distribute modified code is granted -// provided this copyright notice appears in all copies, and a notice -// that the code was modified is included with the copyright notice. -// -// This software is provided "as is" without express or implied warranty, -// and with no claim as to its suitability for any purpose. - -// For more information, see http://www.boost.org - -#ifndef BOOST_FUNCTION_FUNCTION4_HEADER -#define BOOST_FUNCTION_FUNCTION4_HEADER - -#define BOOST_FUNCTION_NUM_ARGS 4 -#define BOOST_FUNCTION_TEMPLATE_PARMS typename T0, typename T1, typename T2, typename T3 -#define BOOST_FUNCTION_TEMPLATE_ARGS T0, T1, T2, T3 -#define BOOST_FUNCTION_PARMS T0 a0, T1 a1, T2 a2, T3 a3 -#define BOOST_FUNCTION_ARGS a0, a1, a2, a3 -#define BOOST_FUNCTION_NOT_0_PARMS T1 a1, T2 a2, T3 a3 -#define BOOST_FUNCTION_NOT_0_ARGS a1, a2, a3 -#define BOOST_FUNCTION_ARG_TYPES typedef T0 arg1_type; typedef T1 arg2_type; typedef T2 arg3_type; typedef T3 arg4_type; - -#include - -#undef BOOST_FUNCTION_ARG_TYPES -#undef BOOST_FUNCTION_NOT_0_ARGS -#undef BOOST_FUNCTION_NOT_0_PARMS -#undef BOOST_FUNCTION_ARGS -#undef BOOST_FUNCTION_PARMS -#undef BOOST_FUNCTION_TEMPLATE_ARGS -#undef BOOST_FUNCTION_TEMPLATE_PARMS -#undef BOOST_FUNCTION_NUM_ARGS - -#endif // BOOST_FUNCTION_FUNCTION4_HEADER diff --git a/include/boost/function/function5.hpp b/include/boost/function/function5.hpp deleted file mode 100644 index b133426..0000000 --- a/include/boost/function/function5.hpp +++ /dev/null @@ -1,39 +0,0 @@ -// Boost.Function library -// -// Copyright (C) 2001 Doug Gregor (gregod@cs.rpi.edu) -// -// Permission to copy, use, sell and distribute this software is granted -// provided this copyright notice appears in all copies. -// Permission to modify the code and to distribute modified code is granted -// provided this copyright notice appears in all copies, and a notice -// that the code was modified is included with the copyright notice. -// -// This software is provided "as is" without express or implied warranty, -// and with no claim as to its suitability for any purpose. - -// For more information, see http://www.boost.org - -#ifndef BOOST_FUNCTION_FUNCTION5_HEADER -#define BOOST_FUNCTION_FUNCTION5_HEADER - -#define BOOST_FUNCTION_NUM_ARGS 5 -#define BOOST_FUNCTION_TEMPLATE_PARMS typename T0, typename T1, typename T2, typename T3, typename T4 -#define BOOST_FUNCTION_TEMPLATE_ARGS T0, T1, T2, T3, T4 -#define BOOST_FUNCTION_PARMS T0 a0, T1 a1, T2 a2, T3 a3, T4 a4 -#define BOOST_FUNCTION_ARGS a0, a1, a2, a3, a4 -#define BOOST_FUNCTION_NOT_0_PARMS T1 a1, T2 a2, T3 a3, T4 a4 -#define BOOST_FUNCTION_NOT_0_ARGS a1, a2, a3, a4 -#define BOOST_FUNCTION_ARG_TYPES typedef T0 arg1_type; typedef T1 arg2_type; typedef T2 arg3_type; typedef T3 arg4_type; typedef T4 arg5_type; - -#include - -#undef BOOST_FUNCTION_ARG_TYPES -#undef BOOST_FUNCTION_NOT_0_ARGS -#undef BOOST_FUNCTION_NOT_0_PARMS -#undef BOOST_FUNCTION_ARGS -#undef BOOST_FUNCTION_PARMS -#undef BOOST_FUNCTION_TEMPLATE_ARGS -#undef BOOST_FUNCTION_TEMPLATE_PARMS -#undef BOOST_FUNCTION_NUM_ARGS - -#endif // BOOST_FUNCTION_FUNCTION5_HEADER diff --git a/include/boost/function/function6.hpp b/include/boost/function/function6.hpp deleted file mode 100644 index 4456334..0000000 --- a/include/boost/function/function6.hpp +++ /dev/null @@ -1,39 +0,0 @@ -// Boost.Function library -// -// Copyright (C) 2001 Doug Gregor (gregod@cs.rpi.edu) -// -// Permission to copy, use, sell and distribute this software is granted -// provided this copyright notice appears in all copies. -// Permission to modify the code and to distribute modified code is granted -// provided this copyright notice appears in all copies, and a notice -// that the code was modified is included with the copyright notice. -// -// This software is provided "as is" without express or implied warranty, -// and with no claim as to its suitability for any purpose. - -// For more information, see http://www.boost.org - -#ifndef BOOST_FUNCTION_FUNCTION6_HEADER -#define BOOST_FUNCTION_FUNCTION6_HEADER - -#define BOOST_FUNCTION_NUM_ARGS 6 -#define BOOST_FUNCTION_TEMPLATE_PARMS typename T0, typename T1, typename T2, typename T3, typename T4, typename T5 -#define BOOST_FUNCTION_TEMPLATE_ARGS T0, T1, T2, T3, T4, T5 -#define BOOST_FUNCTION_PARMS T0 a0, T1 a1, T2 a2, T3 a3, T4 a4, T5 a5 -#define BOOST_FUNCTION_ARGS a0, a1, a2, a3, a4, a5 -#define BOOST_FUNCTION_NOT_0_PARMS T1 a1, T2 a2, T3 a3, T4 a4, T5 a5 -#define BOOST_FUNCTION_NOT_0_ARGS a1, a2, a3, a4, a5 -#define BOOST_FUNCTION_ARG_TYPES typedef T0 arg1_type; typedef T1 arg2_type; typedef T2 arg3_type; typedef T3 arg4_type; typedef T4 arg5_type; typedef T5 arg6_type; - -#include - -#undef BOOST_FUNCTION_ARG_TYPES -#undef BOOST_FUNCTION_NOT_0_ARGS -#undef BOOST_FUNCTION_NOT_0_PARMS -#undef BOOST_FUNCTION_ARGS -#undef BOOST_FUNCTION_PARMS -#undef BOOST_FUNCTION_TEMPLATE_ARGS -#undef BOOST_FUNCTION_TEMPLATE_PARMS -#undef BOOST_FUNCTION_NUM_ARGS - -#endif // BOOST_FUNCTION_FUNCTION6_HEADER diff --git a/include/boost/function/function7.hpp b/include/boost/function/function7.hpp deleted file mode 100644 index 46544fd..0000000 --- a/include/boost/function/function7.hpp +++ /dev/null @@ -1,39 +0,0 @@ -// Boost.Function library -// -// Copyright (C) 2001 Doug Gregor (gregod@cs.rpi.edu) -// -// Permission to copy, use, sell and distribute this software is granted -// provided this copyright notice appears in all copies. -// Permission to modify the code and to distribute modified code is granted -// provided this copyright notice appears in all copies, and a notice -// that the code was modified is included with the copyright notice. -// -// This software is provided "as is" without express or implied warranty, -// and with no claim as to its suitability for any purpose. - -// For more information, see http://www.boost.org - -#ifndef BOOST_FUNCTION_FUNCTION7_HEADER -#define BOOST_FUNCTION_FUNCTION7_HEADER - -#define BOOST_FUNCTION_NUM_ARGS 7 -#define BOOST_FUNCTION_TEMPLATE_PARMS typename T0, typename T1, typename T2, typename T3, typename T4, typename T5, typename T6 -#define BOOST_FUNCTION_TEMPLATE_ARGS T0, T1, T2, T3, T4, T5, T6 -#define BOOST_FUNCTION_PARMS T0 a0, T1 a1, T2 a2, T3 a3, T4 a4, T5 a5, T6 a6 -#define BOOST_FUNCTION_ARGS a0, a1, a2, a3, a4, a5, a6 -#define BOOST_FUNCTION_NOT_0_PARMS T1 a1, T2 a2, T3 a3, T4 a4, T5 a5, T6 a6 -#define BOOST_FUNCTION_NOT_0_ARGS a1, a2, a3, a4, a5, a6 -#define BOOST_FUNCTION_ARG_TYPES typedef T0 arg1_type; typedef T1 arg2_type; typedef T2 arg3_type; typedef T3 arg4_type; typedef T4 arg5_type; typedef T5 arg6_type; typedef T6 arg7_type; - -#include - -#undef BOOST_FUNCTION_ARG_TYPES -#undef BOOST_FUNCTION_NOT_0_ARGS -#undef BOOST_FUNCTION_NOT_0_PARMS -#undef BOOST_FUNCTION_ARGS -#undef BOOST_FUNCTION_PARMS -#undef BOOST_FUNCTION_TEMPLATE_ARGS -#undef BOOST_FUNCTION_TEMPLATE_PARMS -#undef BOOST_FUNCTION_NUM_ARGS - -#endif // BOOST_FUNCTION_FUNCTION7_HEADER diff --git a/include/boost/function/function8.hpp b/include/boost/function/function8.hpp deleted file mode 100644 index ca08983..0000000 --- a/include/boost/function/function8.hpp +++ /dev/null @@ -1,39 +0,0 @@ -// Boost.Function library -// -// Copyright (C) 2001 Doug Gregor (gregod@cs.rpi.edu) -// -// Permission to copy, use, sell and distribute this software is granted -// provided this copyright notice appears in all copies. -// Permission to modify the code and to distribute modified code is granted -// provided this copyright notice appears in all copies, and a notice -// that the code was modified is included with the copyright notice. -// -// This software is provided "as is" without express or implied warranty, -// and with no claim as to its suitability for any purpose. - -// For more information, see http://www.boost.org - -#ifndef BOOST_FUNCTION_FUNCTION8_HEADER -#define BOOST_FUNCTION_FUNCTION8_HEADER - -#define BOOST_FUNCTION_NUM_ARGS 8 -#define BOOST_FUNCTION_TEMPLATE_PARMS typename T0, typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7 -#define BOOST_FUNCTION_TEMPLATE_ARGS T0, T1, T2, T3, T4, T5, T6, T7 -#define BOOST_FUNCTION_PARMS T0 a0, T1 a1, T2 a2, T3 a3, T4 a4, T5 a5, T6 a6, T7 a7 -#define BOOST_FUNCTION_ARGS a0, a1, a2, a3, a4, a5, a6, a7 -#define BOOST_FUNCTION_NOT_0_PARMS T1 a1, T2 a2, T3 a3, T4 a4, T5 a5, T6 a6, T7 a7 -#define BOOST_FUNCTION_NOT_0_ARGS a1, a2, a3, a4, a5, a6, a7 -#define BOOST_FUNCTION_ARG_TYPES typedef T0 arg1_type; typedef T1 arg2_type; typedef T2 arg3_type; typedef T3 arg4_type; typedef T4 arg5_type; typedef T5 arg6_type; typedef T6 arg7_type; typedef T7 arg8_type; - -#include - -#undef BOOST_FUNCTION_ARG_TYPES -#undef BOOST_FUNCTION_NOT_0_ARGS -#undef BOOST_FUNCTION_NOT_0_PARMS -#undef BOOST_FUNCTION_ARGS -#undef BOOST_FUNCTION_PARMS -#undef BOOST_FUNCTION_TEMPLATE_ARGS -#undef BOOST_FUNCTION_TEMPLATE_PARMS -#undef BOOST_FUNCTION_NUM_ARGS - -#endif // BOOST_FUNCTION_FUNCTION8_HEADER diff --git a/include/boost/function/function9.hpp b/include/boost/function/function9.hpp deleted file mode 100644 index db42f66..0000000 --- a/include/boost/function/function9.hpp +++ /dev/null @@ -1,39 +0,0 @@ -// Boost.Function library -// -// Copyright (C) 2001 Doug Gregor (gregod@cs.rpi.edu) -// -// Permission to copy, use, sell and distribute this software is granted -// provided this copyright notice appears in all copies. -// Permission to modify the code and to distribute modified code is granted -// provided this copyright notice appears in all copies, and a notice -// that the code was modified is included with the copyright notice. -// -// This software is provided "as is" without express or implied warranty, -// and with no claim as to its suitability for any purpose. - -// For more information, see http://www.boost.org - -#ifndef BOOST_FUNCTION_FUNCTION9_HEADER -#define BOOST_FUNCTION_FUNCTION9_HEADER - -#define BOOST_FUNCTION_NUM_ARGS 9 -#define BOOST_FUNCTION_TEMPLATE_PARMS typename T0, typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8 -#define BOOST_FUNCTION_TEMPLATE_ARGS T0, T1, T2, T3, T4, T5, T6, T7, T8 -#define BOOST_FUNCTION_PARMS T0 a0, T1 a1, T2 a2, T3 a3, T4 a4, T5 a5, T6 a6, T7 a7, T8 a8 -#define BOOST_FUNCTION_ARGS a0, a1, a2, a3, a4, a5, a6, a7, a8 -#define BOOST_FUNCTION_NOT_0_PARMS T1 a1, T2 a2, T3 a3, T4 a4, T5 a5, T6 a6, T7 a7, T8 a8 -#define BOOST_FUNCTION_NOT_0_ARGS a1, a2, a3, a4, a5, a6, a7, a8 -#define BOOST_FUNCTION_ARG_TYPES typedef T0 arg1_type; typedef T1 arg2_type; typedef T2 arg3_type; typedef T3 arg4_type; typedef T4 arg5_type; typedef T5 arg6_type; typedef T6 arg7_type; typedef T7 arg8_type; typedef T8 arg9_type; - -#include - -#undef BOOST_FUNCTION_ARG_TYPES -#undef BOOST_FUNCTION_NOT_0_ARGS -#undef BOOST_FUNCTION_NOT_0_PARMS -#undef BOOST_FUNCTION_ARGS -#undef BOOST_FUNCTION_PARMS -#undef BOOST_FUNCTION_TEMPLATE_ARGS -#undef BOOST_FUNCTION_TEMPLATE_PARMS -#undef BOOST_FUNCTION_NUM_ARGS - -#endif // BOOST_FUNCTION_FUNCTION9_HEADER diff --git a/include/boost/function/function_base.hpp b/include/boost/function/function_base.hpp deleted file mode 100644 index 04e0a6e..0000000 --- a/include/boost/function/function_base.hpp +++ /dev/null @@ -1,347 +0,0 @@ -// Boost.Function library - -// Copyright (C) 2001, 2002 Doug Gregor (gregod@cs.rpi.edu) -// -// Permission to copy, use, sell and distribute this software is granted -// provided this copyright notice appears in all copies. -// Permission to modify the code and to distribute modified code is granted -// provided this copyright notice appears in all copies, and a notice -// that the code was modified is included with the copyright notice. -// -// This software is provided "as is" without express or implied warranty, -// and with no claim as to its suitability for any purpose. - -// For more information, see http://www.boost.org - -#ifndef BOOST_FUNCTION_BASE_HEADER -#define BOOST_FUNCTION_BASE_HEADER - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#if defined(BOOST_MSVC) && BOOST_MSVC <= 1300 || defined(__ICL) && __ICL <= 600 || defined(__MWERKS__) && __MWERKS__ < 0x2406 -# define BOOST_FUNCTION_TARGET_FIX(x) x -#else -# define BOOST_FUNCTION_TARGET_FIX(x) -#endif // not MSVC - -#ifdef BOOST_FUNCTION_SILENT_DEPRECATED -# define BOOST_FUNCTION_DEPRECATED_PRE -# define BOOST_FUNCTION_DEPRECATED_INNER -#else -# if defined (BOOST_MSVC) && (BOOST_MSVC >= 1300) -# define BOOST_FUNCTION_DEPRECATED_PRE __declspec(deprecated) -# define BOOST_FUNCTION_DEPRECATED_INNER -# else -# define BOOST_FUNCTION_DEPRECATED_PRE -# define BOOST_FUNCTION_DEPRECATED_INNER int deprecated; -# endif -#endif - -namespace boost { - namespace detail { - namespace function { - /** - * A union of a function pointer and a void pointer. This is necessary - * because 5.2.10/6 allows reinterpret_cast<> to safely cast between - * function pointer types and 5.2.9/10 allows static_cast<> to safely - * cast between a void pointer and an object pointer. But it is not legal - * to cast between a function pointer and a void* (in either direction), - * so function requires a union of the two. */ - union any_pointer - { - void* obj_ptr; - const void* const_obj_ptr; - void (*func_ptr)(); - - explicit any_pointer(void* p) : obj_ptr(p) {} - explicit any_pointer(const void* p) : const_obj_ptr(p) {} - explicit any_pointer(void (*p)()) : func_ptr(p) {} - }; - - /** - * The unusable class is a placeholder for unused function arguments - * It is also completely unusable except that it constructable from - * anything. This helps compilers without partial specialization to - * handle Boost.Function objects returning void. - */ - struct unusable - { - unusable() {} - template unusable(const T&) {} - }; - - /* Determine the return type. This supports compilers that do not support - * void returns or partial specialization by silently changing the return - * type to "unusable". - */ - template struct function_return_type { typedef T type; }; - - template<> - struct function_return_type - { - typedef unusable type; - }; - - // The operation type to perform on the given functor/function pointer - enum functor_manager_operation_type { - clone_functor_tag, - destroy_functor_tag - }; - - // Tags used to decide between different types of functions - struct function_ptr_tag {}; - struct function_obj_tag {}; - struct member_ptr_tag {}; - struct function_obj_ref_tag {}; - struct stateless_function_obj_tag {}; - - template - class get_function_tag - { - typedef typename ct_if<(is_pointer::value), - function_ptr_tag, - function_obj_tag>::type ptr_or_obj_tag; - - typedef typename ct_if<(is_member_pointer::value), - member_ptr_tag, - ptr_or_obj_tag>::type ptr_or_obj_or_mem_tag; - - typedef typename ct_if<(is_reference_wrapper::value), - function_obj_ref_tag, - ptr_or_obj_or_mem_tag>::type or_ref_tag; - - public: - typedef typename ct_if<(is_stateless::value), - stateless_function_obj_tag, - or_ref_tag>::type type; - }; - - // The trivial manager does nothing but return the same pointer (if we - // are cloning) or return the null pointer (if we are deleting). - inline any_pointer trivial_manager(any_pointer f, - functor_manager_operation_type op) - { - if (op == clone_functor_tag) - return f; - else - return any_pointer(reinterpret_cast(0)); - } - - /** - * The functor_manager class contains a static function "manage" which - * can clone or destroy the given function/function object pointer. - */ - template - struct functor_manager - { - private: - typedef Functor functor_type; - - // For function pointers, the manager is trivial - static inline any_pointer - manager(any_pointer function_ptr, - functor_manager_operation_type op, - function_ptr_tag) - { - if (op == clone_functor_tag) - return function_ptr; - else - return any_pointer(static_cast(0)); - } - - // For function object pointers, we clone the pointer to each - // function has its own version. - static inline any_pointer - manager(any_pointer function_obj_ptr, - functor_manager_operation_type op, - function_obj_tag) - { -#ifndef BOOST_NO_STD_ALLOCATOR - typedef typename Allocator::template rebind::other - allocator_type; - typedef typename allocator_type::pointer pointer_type; -#else - typedef functor_type* pointer_type; -#endif // BOOST_NO_STD_ALLOCATOR - -# ifndef BOOST_NO_STD_ALLOCATOR - allocator_type allocator; -# endif // BOOST_NO_STD_ALLOCATOR - - if (op == clone_functor_tag) { - functor_type* f = - static_cast(function_obj_ptr.obj_ptr); - - // Clone the functor -# ifndef BOOST_NO_STD_ALLOCATOR - pointer_type copy = allocator.allocate(1); - allocator.construct(copy, *f); - - // Get back to the original pointer type - functor_type* new_f = static_cast(copy); -# else - functor_type* new_f = new functor_type(*f); -# endif // BOOST_NO_STD_ALLOCATOR - return any_pointer(static_cast(new_f)); - } - else { - /* Cast from the void pointer to the functor pointer type */ - functor_type* f = - reinterpret_cast(function_obj_ptr.obj_ptr); - -# ifndef BOOST_NO_STD_ALLOCATOR - /* Cast from the functor pointer type to the allocator's pointer - type */ - pointer_type victim = static_cast(f); - - // Destroy and deallocate the functor - allocator.destroy(victim); - allocator.deallocate(victim, 1); -# else - delete f; -# endif // BOOST_NO_STD_ALLOCATOR - - return any_pointer(static_cast(0)); - } - } - public: - /* Dispatch to an appropriate manager based on whether we have a - function pointer or a function object pointer. */ - static any_pointer - manage(any_pointer functor_ptr, functor_manager_operation_type op) - { - typedef typename get_function_tag::type tag_type; - return manager(functor_ptr, op, tag_type()); - } - }; - - // value=1 if the given type is not "unusable" - template - struct count_if_used - { - BOOST_STATIC_CONSTANT(int, value = 1); - }; - - // value=0 for unusable types - template<> - struct count_if_used - { - BOOST_STATIC_CONSTANT(int, value = 0); - }; - - // Count the number of arguments (from the given set) which are not - // "unusable" (therefore, count those arguments that are used). - template - struct count_used_args - { - BOOST_STATIC_CONSTANT(int, value = - (count_if_used::value + - count_if_used::value + - count_if_used::value + - count_if_used::value + - count_if_used::value + - count_if_used::value + - count_if_used::value + - count_if_used::value + - count_if_used::value + - count_if_used::value)); - }; - } // end namespace function - } // end namespace detail - - /** - * The function_base class contains the basic elements needed for the - * function1, function2, function3, etc. classes. It is common to all - * functions (and as such can be used to tell if we have one of the - * functionN objects). - */ - class function_base - { - public: - function_base() : manager(0), functor(static_cast(0)) {} - - // Is this function empty? - bool empty() const { return !manager; } - - public: // should be protected, but GCC 2.95.3 will fail to allow access - detail::function::any_pointer (*manager)( - detail::function::any_pointer, - detail::function::functor_manager_operation_type); - detail::function::any_pointer functor; - -#if (defined __SUNPRO_CC) && (__SUNPRO_CC <= 0x530) && !(defined BOOST_NO_COMPILER_CONFIG) - // Sun C++ 5.3 can't handle the safe_bool idiom, so don't use it - operator bool () const { return !this->empty(); } -#else - private: - struct dummy { - void nonnull() {}; - }; - - typedef void (dummy::*safe_bool)(); - - public: - operator safe_bool () const - { return (this->empty())? 0 : &dummy::nonnull; } - - safe_bool operator!() const - { return (this->empty())? &dummy::nonnull : 0; } -#endif - }; - - /* Poison comparison between Boost.Function objects (because it is - * meaningless). The comparisons would otherwise be allowed because of the - * conversion required to allow syntax such as: - * boost::function f; - * if (f) { f(5); } - */ - void operator==(const function_base&, const function_base&); - void operator!=(const function_base&, const function_base&); - - namespace detail { - namespace function { - inline bool has_empty_target(const function_base* f) - { - return f->empty(); - } - - inline bool has_empty_target(...) - { - return false; - } - } // end namespace function - } // end namespace detail - - // The default function policy is to do nothing before and after the call. - struct empty_function_policy - { - inline void precall(const function_base*) {} - inline void postcall(const function_base*) {} - }; - - // The default function mixin does nothing. The assignment and - // copy-construction operators are all defined because MSVC defines broken - // versions. - struct empty_function_mixin - { - empty_function_mixin() {} - empty_function_mixin(const empty_function_mixin&) {} - - empty_function_mixin& operator=(const empty_function_mixin&) - { - return *this; - } - }; -} - -#endif // BOOST_FUNCTION_BASE_HEADER diff --git a/include/boost/function/gen_function_N.pl b/include/boost/function/gen_function_N.pl deleted file mode 100644 index a159272..0000000 --- a/include/boost/function/gen_function_N.pl +++ /dev/null @@ -1,111 +0,0 @@ -#!/usr/bin/perl -w -# -# Boost.Function library -# -# Copyright (C) 2001 Doug Gregor (gregod@cs.rpi.edu) -# -# Permission to copy, use, sell and distribute this software is granted -# provided this copyright notice appears in all copies. -# Permission to modify the code and to distribute modified code is granted -# provided this copyright notice appears in all copies, and a notice -# that the code was modified is included with the copyright notice. -# -# This software is provided "as is" without express or implied warranty, -# and with no claim as to its suitability for any purpose. -# -# For more information, see http://www.boost.org -use English; - -if ($#ARGV < 0) { - print "Usage: perl gen_function_N \n"; - exit; -} - - -$totalNumArgs = $ARGV[0]; -for ($numArgs = 0; $numArgs <= $totalNumArgs; ++$numArgs) { - open OUT, ">function$numArgs.hpp"; - print OUT "// Boost.Function library\n"; - print OUT "//\n"; - print OUT "// Copyright (C) 2001 Doug Gregor (gregod\@cs.rpi.edu)\n"; - print OUT "//\n"; - print OUT "// Permission to copy, use, sell and distribute this software is granted\n"; - print OUT "// provided this copyright notice appears in all copies.\n"; - print OUT "// Permission to modify the code and to distribute modified code is granted\n"; - print OUT "// provided this copyright notice appears in all copies, and a notice\n"; - print OUT "// that the code was modified is included with the copyright notice.\n"; - print OUT "//\n"; - print OUT "// This software is provided \"as is\" without express or implied warranty,\n"; - print OUT "// and with no claim as to its suitability for any purpose.\n"; - print OUT " \n"; - print OUT "// For more information, see http://www.boost.org\n"; - print OUT "\n"; - print OUT "#ifndef BOOST_FUNCTION_FUNCTION" . $numArgs . "_HEADER\n"; - print OUT "#define BOOST_FUNCTION_FUNCTION" , $numArgs . "_HEADER\n"; - print OUT "\n"; - print OUT "#define BOOST_FUNCTION_NUM_ARGS $numArgs\n"; - - $templateParms = ""; - for ($i = 0; $i < $numArgs; ++$i) { - if ($i > 0) { - $templateParms .= ", "; - } - $templateParms .= "typename T$i"; - } - print OUT "#define BOOST_FUNCTION_TEMPLATE_PARMS $templateParms\n"; - - $_ = $templateParms; - s/typename //g; - $templateArgs = $_; - print OUT "#define BOOST_FUNCTION_TEMPLATE_ARGS $templateArgs\n"; - - $parms = ""; - for ($i = 0; $i < $numArgs; ++$i) { - if ($i > 0) { - $parms .= ", "; - } - $parms .= "T$i a$i"; - } - print OUT "#define BOOST_FUNCTION_PARMS $parms\n"; - - $args = ""; - for ($i = 0; $i < $numArgs; ++$i) { - if ($i > 0) { - $args .= ", "; - } - $args .= "a$i"; - } - print OUT "#define BOOST_FUNCTION_ARGS $args\n"; - - $not0Parms = ""; - for ($i = 1; $i < $numArgs; ++$i) { - if ($i > 1) { - $not0Parms .= ", "; - } - $not0Parms .= "T$i a$i"; - } - print OUT "#define BOOST_FUNCTION_NOT_0_PARMS $not0Parms\n"; - - $not0Args = ""; - for ($i = 1; $i < $numArgs; ++$i) { - if ($i > 1) { - $not0Args .= ", "; - } - $not0Args .= "a$i"; - } - print OUT "#define BOOST_FUNCTION_NOT_0_ARGS $not0Args\n"; - - print OUT "\n"; - print OUT "#include \n"; - print OUT "\n"; - print OUT "#undef BOOST_FUNCTION_NOT_0_ARGS\n"; - print OUT "#undef BOOST_FUNCTION_NOT_0_PARMS\n"; - print OUT "#undef BOOST_FUNCTION_ARGS\n"; - print OUT "#undef BOOST_FUNCTION_PARMS\n"; - print OUT "#undef BOOST_FUNCTION_TEMPLATE_ARGS\n"; - print OUT "#undef BOOST_FUNCTION_TEMPLATE_PARMS\n"; - print OUT "#undef BOOST_FUNCTION_NUM_ARGS\n"; - print OUT "\n"; - print OUT "#endif // BOOST_FUNCTION_FUNCTION" . $numArgs . "_HEADER\n"; - close OUT; -} diff --git a/index.html b/index.html deleted file mode 100644 index 1d298bc..0000000 --- a/index.html +++ /dev/null @@ -1,132 +0,0 @@ - - - - Boost.Function - - - - -

Header <boost/function.hpp>

- -

The header <boost/function.hpp> includes a family of class templates that are function object wrappers. The notion is similar to a generalized callback. It shares features with function pointers in that both define a call interface (e.g., a function taking two integer arguments and returning a floating-point value) through which some implementation can be called, and the implementation that is invoked may change throughout the course of the program. - -

Generally, any place in which a function pointer would be used to defer a call or make a callback, Boost.Function can be used instead to allow the user greater flexibility in the implementation of the target. Targets can be any 'compatible' function object (or function pointer), meaning that the arguments to the interface designated by Boost.Function can be converted to the arguments of the target function object. - -

- -

Compatibility Note

 -

Boost.Function has been partially redesigned to minimize the interface and make it cleaner. Several seldom- or never-used features of the older Boost.Function have been deprecated and will be removed in the near future. Here is a list of features that have been deprecated, the likely impact of the deprecations, and how to adjust your code: -

    -
  • The boost::function class template syntax has - changed. The old syntax, e.g., boost::function<int, float, - double, std::string>, has been changed to a more natural - syntax boost::function<int (float, double, - std::string)>, where all return and argument types are - encoded in a single function type parameter. Any other template - parameters (e.g., the Allocator) follow this single - parameter. - -

    The resolution to this change depends on the - abilities of your compiler: if your compiler supports template - partial specialization and can parse function types (most do), modify - your code to use the newer - syntax (preferable) or directly use one of the - functionN classes whose syntax has not - changed. If your compiler does not support template partial - specialization or function types, you must take the latter option and - use the numbered Boost.Function classes. This option merely requires - changing types such as boost::function<void, int, int> - to boost::function2<void, int, int> (adding the number of - function arguments to the end of the class name). - -

    Support for the old syntax with the - boost::function class template will persist for a short - while, but will eventually be removed so that we can provide better - error messages and link compatibility.

    • - -
  • The invocation - policy template parameter (Policy) has been deprecated - and will be removed. There is no direct equivalent to this rarely - used feature.
  • The mixin template parameter - (Mixin) has been deprecated and will be removed. There - is not direct equivalent to this rarely used feature.
  • The - set methods have been deprecated and will be - removed. Use the assignment operator instead.
    • -
- -

To aid in porting to the new syntax and removing the use of deprecated features, define the preprocessor macro BOOST_FUNCTION_NO_DEPRECATED. This macro makes all deprecated features unavailable. A program compiled with BOOST_FUNCTION_NO_DEPRECATED will likely be prepared when the deprecated features are removed. - -

Boost.Function vs. Function Pointers

-

Boost.Function has several advantages over function pointers, namely: - -

    -
  • Boost.Function allows arbitrary compatible function objects to be targets (instead of requiring an exact function signature).
    • -
  • Boost.Function may be used with argument-binding and other function object construction libraries.
    • -
  • Boost.Function has predictible debug behavior when an empty function object is called.
    • -
  • Boost.Function can be adapted to perform operations before and after each call, allowing, for instance, synchronization primitives to be made part of the function type.
    • -
- -And, of course, function pointers have several advantages over Boost.Function: - -
    -
  • Function pointers are smaller (the size of one pointer instead of three)
    • -
  • Function pointers are faster (Boost.Function may require two calls through function pointers)
    • -
  • Function pointers are backward-compatible with C libraries.
    • -
  • More readable error messages.
    • -
- - -

The above two lists were adapted from comments made by Darin Adler. - -

Performance

-

Function object wrapper size

-

Function object wrappers will be the size of two function pointers plus one function pointer or data pointer (whichever is larger). On common 32-bit platforms, this amounts to 12 bytes per wrapper. Additionally, the function object target will be allocated on the heap. - -

Copying efficiency

-

Copying function object wrappers may require allocating memory for a copy of the function object target. The default allocator may be replaced with a faster custom allocator or one may choose to allow the function object wrappers to only store function object targets by reference (using ref) if the cost of this cloning becomes prohibitive. - -

Invocation efficiency

-

With a properly inlining compiler, an invocation of a function object requires one call through a function pointer. If the call is to a free function pointer, an additional call must be made to that function pointer (unless the compiler has very powerful interprocedural analysis). - -

Portability

-

The function object wrappers have been designed to be as portable as possible, and to support many compilers even when they do not support the C++ standard well. The following compilers have passed all of the test cases included with boost::function. -

    -
  • GCC 2.95.3
    • -
  • GCC 3.0
    • -
  • SGI MIPSpro 7.3.0
    • -
  • Borland C++ 5.5.1
    • -
  • Comeau C++ 4.2.45.2
    • -
  • Metrowerks Codewarrior 6.1
    • -
- -

The following compilers work with boost::function, but have some problems: -

    -
  • Microsoft Visual C++ 6.0 (service pack 5): allocators not supported, some problems with boost::function class template (numbered variants seem to work)
    • -
  • Intel C++ 5.0: allocators not supported
    • -
- -

If your compiler is not listed, there is a small set of tests to stress the capabilities of the boost::function library. A standards-compliant compiler should compile the code without any modifications, but if you find you run into problems please submit a bug report. - -

Design rationale

-

Combatting virtual function bloat

-

The use of virtual functions tends to cause 'code bloat' on many compilers. When a class contains a virtual function, it is necessary to emit an additional function that classifies the type of the object. It has been our experience that these auxiliary functions increase the size of the executable significantly when many boost::function objects are used. - -

In Boost.Function, an alternative but equivalent approach was taken using free functions instead of virtual functions. The Boost.Function object essentially holds two pointers to make a valid target call: a void pointer to the function object it contains and a void pointer to an "invoker" that can call the function object, given the function pointer. This invoker function performs the argument and return value conversions Boost.Function provides. A third pointer points to a free function called the "manager", which handles the cloning and destruction of function objects. The scheme is typesafe because the only functions that actually handle the function object, the invoker and the manager, are instantiated given the type of the function object, so they can safely cast the incoming void pointer (the function object pointer) to the appropriate type. - -

Acknowledgements

-

Many people were involved in the construction of this library. William Kempf, Jesse Jones and Karl Nelson were all extremely helpful in isolating an interface and scope for the library. John Maddock managed the formal review, and many reviewers gave excellent comments on interface, implementation, and documentation. - -

-
Doug Gregor
- - diff --git a/test/allocator_test.cpp b/test/allocator_test.cpp deleted file mode 100644 index cab749f..0000000 --- a/test/allocator_test.cpp +++ /dev/null @@ -1,88 +0,0 @@ -// Boost.Function library - -// Copyright (C) 2001 Doug Gregor (gregod@cs.rpi.edu) -// -// Permission to copy, use, sell and distribute this software is granted -// provided this copyright notice appears in all copies. -// Permission to modify the code and to distribute modified code is granted -// provided this copyright notice appears in all copies, and a notice -// that the code was modified is included with the copyright notice. -// -// This software is provided "as is" without express or implied warranty, -// and with no claim as to its suitability for any purpose. - -// For more information, see http://www.boost.org - -#define BOOST_INCLUDE_MAIN -#include -#include -#include -#include - -using namespace std; -using namespace boost; - -static int alloc_count = 0; -static int dealloc_count = 0; - -template -struct counting_allocator : public std::allocator -{ - template - struct rebind - { - typedef counting_allocator other; - }; - - - T* allocate(std::size_t n) - { - alloc_count++; - return std::allocator::allocate(n); - } - - void deallocate(T* p, std::size_t n) - { - dealloc_count++; - std::allocator::deallocate(p, n); - } -}; - -static int do_minus(int x, int y) { return x-y; } - -struct DoNothing -{ - void operator()() const {} -}; - -static void do_nothing() {} - -int -test_main(int, char*[]) -{ - function::allocator< counting_allocator >::type f; - f = plus(); - f.clear(); - BOOST_TEST(alloc_count == 1); - BOOST_TEST(dealloc_count == 1); - - alloc_count = 0; - dealloc_count = 0; - f = &do_minus; - f.clear(); - - function::allocator< counting_allocator >::type fv; - alloc_count = 0; - dealloc_count = 0; - fv = DoNothing(); - fv.clear(); - BOOST_TEST(alloc_count == 1); - BOOST_TEST(dealloc_count == 1); - - alloc_count = 0; - dealloc_count = 0; - fv = &do_nothing; - fv.clear(); - - return 0; -} diff --git a/test/deprecated_syntax_test.cpp b/test/deprecated_syntax_test.cpp deleted file mode 100644 index 31c5152..0000000 --- a/test/deprecated_syntax_test.cpp +++ /dev/null @@ -1,645 +0,0 @@ -// Boost.Function library - -// Copyright (C) 2001 Doug Gregor (gregod@cs.rpi.edu) -// -// Permission to copy, use, sell and distribute this software is granted -// provided this copyright notice appears in all copies. -// Permission to modify the code and to distribute modified code is granted -// provided this copyright notice appears in all copies, and a notice -// that the code was modified is included with the copyright notice. -// -// This software is provided "as is" without express or implied warranty, -// and with no claim as to its suitability for any purpose. - -// For more information, see http://www.boost.org - -#define BOOST_INCLUDE_MAIN -#include -#include -#include -#include -#include - -using namespace boost; -using std::string; -using std::negate; - -int global_int; - -struct write_five_obj { void operator()() const { global_int = 5; } }; -struct write_three_obj { int operator()() const { global_int = 3; return 7; }}; -static void write_five() { global_int = 5; } -static void write_three() { global_int = 3; } -struct generate_five_obj { int operator()() const { return 5; } }; -struct generate_three_obj { int operator()() const { return 3; } }; -static int generate_five() { return 5; } -static int generate_three() { return 3; } -static string identity_str(const string& s) { return s; } -static string string_cat(const string& s1, const string& s2) { return s1+s2; } -static int sum_ints(int x, int y) { return x+y; } - -struct write_const_1_nonconst_2 -{ - void operator()() { global_int = 2; } - void operator()() const { global_int = 1; } -}; - -struct add_to_obj -{ - add_to_obj(int v) : value(v) {} - - int operator()(int x) const { return value + x; } - - int value; -}; - -static void -test_zero_args() -{ - typedef function func_void_type; - - write_five_obj five; - write_three_obj three; - - // Default construction - func_void_type v1; - BOOST_TEST(v1.empty()); - - // Assignment to an empty function - v1 = five; - BOOST_TEST(!v1.empty()); - - // Invocation of a function - global_int = 0; - v1(); - BOOST_TEST(global_int == 5); - - // clear() method - v1.clear(); - BOOST_TEST(v1.empty()); - - // Assignment to an empty function - v1 = three; - BOOST_TEST(!v1.empty()); - - // Invocation and self-assignment - global_int = 0; - v1 = v1; - v1(); - BOOST_TEST(global_int == 3); - - // Assignment to a non-empty function - v1 = five; - - // Invocation and self-assignment - global_int = 0; - v1 = (v1); - v1(); - BOOST_TEST(global_int == 5); - - // clear() - v1.clear(); - BOOST_TEST(v1.empty()); - - // Assignment to an empty function from a free function - v1 = BOOST_FUNCTION_TARGET_FIX(&) write_five; - BOOST_TEST(!v1.empty()); - - // Invocation - global_int = 0; - v1(); - BOOST_TEST(global_int == 5); - - // Assignment to a non-empty function from a free function - v1 = BOOST_FUNCTION_TARGET_FIX(&) write_three; - BOOST_TEST(!v1.empty()); - - // Invocation - global_int = 0; - v1(); - BOOST_TEST(global_int == 3); - - // Assignment - v1 = five; - BOOST_TEST(!v1.empty()); - - // Invocation - global_int = 0; - v1(); - BOOST_TEST(global_int == 5); - - // Assignment to a non-empty function from a free function - v1 = &write_three; - BOOST_TEST(!v1.empty()); - - // Invocation - global_int = 0; - v1(); - BOOST_TEST(global_int == 3); - - // Construction from another function (that is empty) - v1.clear(); - func_void_type v2(v1); - BOOST_TEST(!v2? true : false); - - // Assignment to an empty function - v2 = three; - BOOST_TEST(!v2.empty()); - - // Invocation - global_int = 0; - v2(); - BOOST_TEST(global_int == 3); - - // Assignment to a non-empty function - v2 = (five); - - // Invocation - global_int = 0; - v2(); - BOOST_TEST(global_int == 5); - - v2.clear(); - BOOST_TEST(v2.empty()); - - // Assignment to an empty function from a free function - v2 = (BOOST_FUNCTION_TARGET_FIX(&) write_five); - BOOST_TEST(v2? true : false); - - // Invocation - global_int = 0; - v2(); - BOOST_TEST(global_int == 5); - - // Assignment to a non-empty function from a free function - v2 = BOOST_FUNCTION_TARGET_FIX(&) write_three; - BOOST_TEST(!v2.empty()); - - // Invocation - global_int = 0; - v2(); - BOOST_TEST(global_int == 3); - - // Swapping - v1 = five; - swap(v1, v2); - v2(); - BOOST_TEST(global_int == 5); - v1(); - BOOST_TEST(global_int == 3); - swap(v1, v2); - v1.clear(); - - // Assignment - v2 = five; - BOOST_TEST(!v2.empty()); - - // Invocation - global_int = 0; - v2(); - BOOST_TEST(global_int == 5); - - // Assignment to a non-empty function from a free function - v2 = &write_three; - BOOST_TEST(!v2.empty()); - - // Invocation - global_int = 0; - v2(); - BOOST_TEST(global_int == 3); - - // Assignment to a function from an empty function - v2 = v1; - BOOST_TEST(v2.empty()); - - // Assignment to a function from a function with a functor - v1 = three; - v2 = v1; - BOOST_TEST(!v1.empty()); - BOOST_TEST(!v2.empty()); - - // Invocation - global_int = 0; - v1(); - BOOST_TEST(global_int == 3); - global_int = 0; - v2(); - BOOST_TEST(global_int == 3); - - // Assign to a function from a function with a function - v2 = BOOST_FUNCTION_TARGET_FIX(&) write_five; - v1 = v2; - BOOST_TEST(!v1.empty()); - BOOST_TEST(!v2.empty()); - global_int = 0; - v1(); - BOOST_TEST(global_int == 5); - global_int = 0; - v2(); - BOOST_TEST(global_int == 5); - - // Construct a function given another function containing a function - func_void_type v3(v1); - - // Invocation of a function - global_int = 0; - v3(); - BOOST_TEST(global_int == 5); - - // clear() method - v3.clear(); - BOOST_TEST(!v3? true : false); - - // Assignment to an empty function - v3 = three; - BOOST_TEST(!v3.empty()); - - // Invocation - global_int = 0; - v3(); - BOOST_TEST(global_int == 3); - - // Assignment to a non-empty function - v3 = five; - - // Invocation - global_int = 0; - v3(); - BOOST_TEST(global_int == 5); - - // clear() - v3.clear(); - BOOST_TEST(v3.empty()); - - // Assignment to an empty function from a free function - v3 = &write_five; - BOOST_TEST(!v3.empty()); - - // Invocation - global_int = 0; - v3(); - BOOST_TEST(global_int == 5); - - // Assignment to a non-empty function from a free function - v3 = &write_three; - BOOST_TEST(!v3.empty()); - - // Invocation - global_int = 0; - v3(); - BOOST_TEST(global_int == 3); - - // Assignment - v3 = five; - BOOST_TEST(!v3.empty()); - - // Invocation - global_int = 0; - v3(); - BOOST_TEST(global_int == 5); - - // Construction of a function from a function containing a functor - func_void_type v4(v3); - - // Invocation of a function - global_int = 0; - v4(); - BOOST_TEST(global_int == 5); - - // clear() method - v4.clear(); - BOOST_TEST(v4.empty()); - - // Assignment to an empty function - v4 = three; - BOOST_TEST(!v4.empty()); - - // Invocation - global_int = 0; - v4(); - BOOST_TEST(global_int == 3); - - // Assignment to a non-empty function - v4 = five; - - // Invocation - global_int = 0; - v4(); - BOOST_TEST(global_int == 5); - - // clear() - v4.clear(); - BOOST_TEST(v4.empty()); - - // Assignment to an empty function from a free function - v4 = &write_five; - BOOST_TEST(!v4.empty()); - - // Invocation - global_int = 0; - v4(); - BOOST_TEST(global_int == 5); - - // Assignment to a non-empty function from a free function - v4 = &write_three; - BOOST_TEST(!v4.empty()); - - // Invocation - global_int = 0; - v4(); - BOOST_TEST(global_int == 3); - - // Assignment - v4 = five; - BOOST_TEST(!v4.empty()); - - // Invocation - global_int = 0; - v4(); - BOOST_TEST(global_int == 5); - - // Construction of a function from a functor - func_void_type v5(five); - - // Invocation of a function - global_int = 0; - v5(); - BOOST_TEST(global_int == 5); - - // clear() method - v5.clear(); - BOOST_TEST(v5.empty()); - - // Assignment to an empty function - v5 = three; - BOOST_TEST(!v5.empty()); - - // Invocation - global_int = 0; - v5(); - BOOST_TEST(global_int == 3); - - // Assignment to a non-empty function - v5 = five; - - // Invocation - global_int = 0; - v5(); - BOOST_TEST(global_int == 5); - - // clear() - v5.clear(); - BOOST_TEST(v5.empty()); - - // Assignment to an empty function from a free function - v5 = &write_five; - BOOST_TEST(!v5.empty()); - - // Invocation - global_int = 0; - v5(); - BOOST_TEST(global_int == 5); - - // Assignment to a non-empty function from a free function - v5 = &write_three; - BOOST_TEST(!v5.empty()); - - // Invocation - global_int = 0; - v5(); - BOOST_TEST(global_int == 3); - - // Assignment - v5 = five; - BOOST_TEST(!v5.empty()); - - // Invocation - global_int = 0; - v5(); - BOOST_TEST(global_int == 5); - - // Construction of a function from a function - func_void_type v6(&write_five); - - // Invocation of a function - global_int = 0; - v6(); - BOOST_TEST(global_int == 5); - - // clear() method - v6.clear(); - BOOST_TEST(v6.empty()); - - // Assignment to an empty function - v6 = three; - BOOST_TEST(!v6.empty()); - - // Invocation - global_int = 0; - v6(); - BOOST_TEST(global_int == 3); - - // Assignment to a non-empty function - v6 = five; - - // Invocation - global_int = 0; - v6(); - BOOST_TEST(global_int == 5); - - // clear() - v6.clear(); - BOOST_TEST(v6.empty()); - - // Assignment to an empty function from a free function - v6 = &write_five; - BOOST_TEST(!v6.empty()); - - // Invocation - global_int = 0; - v6(); - BOOST_TEST(global_int == 5); - - // Assignment to a non-empty function from a free function - v6 = &write_three; - BOOST_TEST(!v6.empty()); - - // Invocation - global_int = 0; - v6(); - BOOST_TEST(global_int == 3); - - // Assignment - v6 = five; - BOOST_TEST(!v6.empty()); - - // Invocation - global_int = 0; - v6(); - BOOST_TEST(global_int == 5); - - // Const vs. non-const - write_const_1_nonconst_2 one_or_two; - const function v7(one_or_two); - function v8(one_or_two); - - global_int = 0; - v7(); - BOOST_TEST(global_int == 2); - - global_int = 0; - v8(); - BOOST_TEST(global_int == 2); - - // Test return values - typedef function func_int_type; - generate_five_obj gen_five; - generate_three_obj gen_three; - - func_int_type i0(gen_five); - - BOOST_TEST(i0() == 5); - i0 = gen_three; - BOOST_TEST(i0() == 3); - i0 = &generate_five; - BOOST_TEST(i0() == 5); - i0 = &generate_three; - BOOST_TEST(i0() == 3); - BOOST_TEST(i0? true : false); - i0.clear(); - BOOST_TEST(!i0? true : false); - - // Test return values with compatible types - typedef function func_long_type; - func_long_type i1(gen_five); - - BOOST_TEST(i1() == 5); - i1 = gen_three; - BOOST_TEST(i1() == 3); - i1 = &generate_five; - BOOST_TEST(i1() == 5); - i1 = &generate_three; - BOOST_TEST(i1() == 3); - BOOST_TEST(i1? true : false); - i1.clear(); - BOOST_TEST(!i1? true : false); -} - -static void -test_one_arg() -{ - negate neg; - - function f1(neg); - BOOST_TEST(f1(5) == -5); - - function id(&identity_str); - BOOST_TEST(id("str") == "str"); - - function id2(&identity_str); - BOOST_TEST(id2("foo") == "foo"); - - add_to_obj add_to(5); - function f2(add_to); - BOOST_TEST(f2(3) == 8); - - const function cf2(add_to); - BOOST_TEST(cf2(3) == 8); -} - -static void -test_two_args() -{ - function cat(&string_cat); - BOOST_TEST(cat("str", "ing") == "string"); - - function sum(&sum_ints); - BOOST_TEST(sum(2, 3) == 5); -} - -static void -test_emptiness() -{ - function f1; - BOOST_TEST(f1.empty()); - - function f2; - f2 = f1; - BOOST_TEST(f2.empty()); - - function f3; - f3 = f2; - BOOST_TEST(f3.empty()); -} - -struct X { - X(int v) : value(v) {} - - int twice() const { return 2*value; } - int plus(int v) { return value + v; } - - int value; -}; - -static void -test_member_functions() -{ - boost::function f1(&X::twice); - - X one(1); - X five(5); - - BOOST_TEST(f1(&one) == 2); - BOOST_TEST(f1(&five) == 10); - - boost::function f1_2; - f1_2 = &X::twice; - - BOOST_TEST(f1_2(&one) == 2); - BOOST_TEST(f1_2(&five) == 10); - - boost::function f2(&X::plus); - BOOST_TEST(f2(one, 3) == 4); - BOOST_TEST(f2(five, 4) == 9); -} - -struct add_with_throw_on_copy { - int operator()(int x, int y) const { return x+y; } - - add_with_throw_on_copy() {} - - add_with_throw_on_copy(const add_with_throw_on_copy&) - { - throw std::runtime_error("But this CAN'T throw"); - } - - add_with_throw_on_copy& operator=(const add_with_throw_on_copy&) - { - throw std::runtime_error("But this CAN'T throw"); - } -}; - -static void -test_ref() -{ - add_with_throw_on_copy atc; - try { - boost::function f(ref(atc)); - BOOST_TEST(f(1, 3) == 4); - } - catch(std::runtime_error e) { - BOOST_ERROR("Nonthrowing constructor threw an exception"); - } -} - -int test_main(int, char* []) -{ - test_zero_args(); - test_one_arg(); - test_two_args(); - test_emptiness(); - test_member_functions(); - test_ref(); - - return 0; -} diff --git a/test/function_n_test.cpp b/test/function_n_test.cpp deleted file mode 100644 index ac01f0e..0000000 --- a/test/function_n_test.cpp +++ /dev/null @@ -1,645 +0,0 @@ -// Boost.Function library - -// Copyright (C) 2001 Doug Gregor (gregod@cs.rpi.edu) -// -// Permission to copy, use, sell and distribute this software is granted -// provided this copyright notice appears in all copies. -// Permission to modify the code and to distribute modified code is granted -// provided this copyright notice appears in all copies, and a notice -// that the code was modified is included with the copyright notice. -// -// This software is provided "as is" without express or implied warranty, -// and with no claim as to its suitability for any purpose. - -// For more information, see http://www.boost.org - -#define BOOST_INCLUDE_MAIN -#include -#include -#include -#include -#include - -using namespace boost; -using std::string; -using std::negate; - -int global_int; - -struct write_five_obj { void operator()() const { global_int = 5; } }; -struct write_three_obj { int operator()() const { global_int = 3; return 7; }}; -static void write_five() { global_int = 5; } -static void write_three() { global_int = 3; } -struct generate_five_obj { int operator()() const { return 5; } }; -struct generate_three_obj { int operator()() const { return 3; } }; -static int generate_five() { return 5; } -static int generate_three() { return 3; } -static string identity_str(const string& s) { return s; } -static string string_cat(const string& s1, const string& s2) { return s1+s2; } -static int sum_ints(int x, int y) { return x+y; } - -struct write_const_1_nonconst_2 -{ - void operator()() { global_int = 2; } - void operator()() const { global_int = 1; } -}; - -struct add_to_obj -{ - add_to_obj(int v) : value(v) {} - - int operator()(int x) const { return value + x; } - - int value; -}; - -static void -test_zero_args() -{ - typedef function0 func_void_type; - - write_five_obj five; - write_three_obj three; - - // Default construction - func_void_type v1; - BOOST_TEST(v1.empty()); - - // Assignment to an empty function - v1 = five; - BOOST_TEST(!v1.empty()); - - // Invocation of a function - global_int = 0; - v1(); - BOOST_TEST(global_int == 5); - - // clear() method - v1.clear(); - BOOST_TEST(v1.empty()); - - // Assignment to an empty function - v1 = three; - BOOST_TEST(!v1.empty()); - - // Invocation and self-assignment - global_int = 0; - v1 = v1; - v1(); - BOOST_TEST(global_int == 3); - - // Assignment to a non-empty function - v1 = five; - - // Invocation and self-assignment - global_int = 0; - v1 = (v1); - v1(); - BOOST_TEST(global_int == 5); - - // clear() - v1.clear(); - BOOST_TEST(v1.empty()); - - // Assignment to an empty function from a free function - v1 = write_five; - BOOST_TEST(!v1.empty()); - - // Invocation - global_int = 0; - v1(); - BOOST_TEST(global_int == 5); - - // Assignment to a non-empty function from a free function - v1 = &write_three; - BOOST_TEST(!v1.empty()); - - // Invocation - global_int = 0; - v1(); - BOOST_TEST(global_int == 3); - - // Assignment - v1 = five; - BOOST_TEST(!v1.empty()); - - // Invocation - global_int = 0; - v1(); - BOOST_TEST(global_int == 5); - - // Assignment to a non-empty function from a free function - v1 = write_three; - BOOST_TEST(!v1.empty()); - - // Invocation - global_int = 0; - v1(); - BOOST_TEST(global_int == 3); - - // Construction from another function (that is empty) - v1.clear(); - func_void_type v2(v1); - BOOST_TEST(!v2? true : false); - - // Assignment to an empty function - v2 = three; - BOOST_TEST(!v2.empty()); - - // Invocation - global_int = 0; - v2(); - BOOST_TEST(global_int == 3); - - // Assignment to a non-empty function - v2 = (five); - - // Invocation - global_int = 0; - v2(); - BOOST_TEST(global_int == 5); - - v2.clear(); - BOOST_TEST(v2.empty()); - - // Assignment to an empty function from a free function - v2 = (&write_five); - BOOST_TEST(v2? true : false); - - // Invocation - global_int = 0; - v2(); - BOOST_TEST(global_int == 5); - - // Assignment to a non-empty function from a free function - v2 = &write_three; - BOOST_TEST(!v2.empty()); - - // Invocation - global_int = 0; - v2(); - BOOST_TEST(global_int == 3); - - // Swapping - v1 = five; - swap(v1, v2); - v2(); - BOOST_TEST(global_int == 5); - v1(); - BOOST_TEST(global_int == 3); - swap(v1, v2); - v1.clear(); - - // Assignment - v2 = five; - BOOST_TEST(!v2.empty()); - - // Invocation - global_int = 0; - v2(); - BOOST_TEST(global_int == 5); - - // Assignment to a non-empty function from a free function - v2 = &write_three; - BOOST_TEST(!v2.empty()); - - // Invocation - global_int = 0; - v2(); - BOOST_TEST(global_int == 3); - - // Assignment to a function from an empty function - v2 = v1; - BOOST_TEST(v2.empty()); - - // Assignment to a function from a function with a functor - v1 = three; - v2 = v1; - BOOST_TEST(!v1.empty()); - BOOST_TEST(!v2.empty()); - - // Invocation - global_int = 0; - v1(); - BOOST_TEST(global_int == 3); - global_int = 0; - v2(); - BOOST_TEST(global_int == 3); - - // Assign to a function from a function with a function - v2 = &write_five; - v1 = v2; - BOOST_TEST(!v1.empty()); - BOOST_TEST(!v2.empty()); - global_int = 0; - v1(); - BOOST_TEST(global_int == 5); - global_int = 0; - v2(); - BOOST_TEST(global_int == 5); - - // Construct a function given another function containing a function - func_void_type v3(v1); - - // Invocation of a function - global_int = 0; - v3(); - BOOST_TEST(global_int == 5); - - // clear() method - v3.clear(); - BOOST_TEST(!v3? true : false); - - // Assignment to an empty function - v3 = three; - BOOST_TEST(!v3.empty()); - - // Invocation - global_int = 0; - v3(); - BOOST_TEST(global_int == 3); - - // Assignment to a non-empty function - v3 = five; - - // Invocation - global_int = 0; - v3(); - BOOST_TEST(global_int == 5); - - // clear() - v3.clear(); - BOOST_TEST(v3.empty()); - - // Assignment to an empty function from a free function - v3 = &write_five; - BOOST_TEST(!v3.empty()); - - // Invocation - global_int = 0; - v3(); - BOOST_TEST(global_int == 5); - - // Assignment to a non-empty function from a free function - v3 = &write_three; - BOOST_TEST(!v3.empty()); - - // Invocation - global_int = 0; - v3(); - BOOST_TEST(global_int == 3); - - // Assignment - v3 = five; - BOOST_TEST(!v3.empty()); - - // Invocation - global_int = 0; - v3(); - BOOST_TEST(global_int == 5); - - // Construction of a function from a function containing a functor - func_void_type v4(v3); - - // Invocation of a function - global_int = 0; - v4(); - BOOST_TEST(global_int == 5); - - // clear() method - v4.clear(); - BOOST_TEST(v4.empty()); - - // Assignment to an empty function - v4 = three; - BOOST_TEST(!v4.empty()); - - // Invocation - global_int = 0; - v4(); - BOOST_TEST(global_int == 3); - - // Assignment to a non-empty function - v4 = five; - - // Invocation - global_int = 0; - v4(); - BOOST_TEST(global_int == 5); - - // clear() - v4.clear(); - BOOST_TEST(v4.empty()); - - // Assignment to an empty function from a free function - v4 = &write_five; - BOOST_TEST(!v4.empty()); - - // Invocation - global_int = 0; - v4(); - BOOST_TEST(global_int == 5); - - // Assignment to a non-empty function from a free function - v4 = &write_three; - BOOST_TEST(!v4.empty()); - - // Invocation - global_int = 0; - v4(); - BOOST_TEST(global_int == 3); - - // Assignment - v4 = five; - BOOST_TEST(!v4.empty()); - - // Invocation - global_int = 0; - v4(); - BOOST_TEST(global_int == 5); - - // Construction of a function from a functor - func_void_type v5(five); - - // Invocation of a function - global_int = 0; - v5(); - BOOST_TEST(global_int == 5); - - // clear() method - v5.clear(); - BOOST_TEST(v5.empty()); - - // Assignment to an empty function - v5 = three; - BOOST_TEST(!v5.empty()); - - // Invocation - global_int = 0; - v5(); - BOOST_TEST(global_int == 3); - - // Assignment to a non-empty function - v5 = five; - - // Invocation - global_int = 0; - v5(); - BOOST_TEST(global_int == 5); - - // clear() - v5.clear(); - BOOST_TEST(v5.empty()); - - // Assignment to an empty function from a free function - v5 = &write_five; - BOOST_TEST(!v5.empty()); - - // Invocation - global_int = 0; - v5(); - BOOST_TEST(global_int == 5); - - // Assignment to a non-empty function from a free function - v5 = &write_three; - BOOST_TEST(!v5.empty()); - - // Invocation - global_int = 0; - v5(); - BOOST_TEST(global_int == 3); - - // Assignment - v5 = five; - BOOST_TEST(!v5.empty()); - - // Invocation - global_int = 0; - v5(); - BOOST_TEST(global_int == 5); - - // Construction of a function from a function - func_void_type v6(&write_five); - - // Invocation of a function - global_int = 0; - v6(); - BOOST_TEST(global_int == 5); - - // clear() method - v6.clear(); - BOOST_TEST(v6.empty()); - - // Assignment to an empty function - v6 = three; - BOOST_TEST(!v6.empty()); - - // Invocation - global_int = 0; - v6(); - BOOST_TEST(global_int == 3); - - // Assignment to a non-empty function - v6 = five; - - // Invocation - global_int = 0; - v6(); - BOOST_TEST(global_int == 5); - - // clear() - v6.clear(); - BOOST_TEST(v6.empty()); - - // Assignment to an empty function from a free function - v6 = &write_five; - BOOST_TEST(!v6.empty()); - - // Invocation - global_int = 0; - v6(); - BOOST_TEST(global_int == 5); - - // Assignment to a non-empty function from a free function - v6 = &write_three; - BOOST_TEST(!v6.empty()); - - // Invocation - global_int = 0; - v6(); - BOOST_TEST(global_int == 3); - - // Assignment - v6 = five; - BOOST_TEST(!v6.empty()); - - // Invocation - global_int = 0; - v6(); - BOOST_TEST(global_int == 5); - - // Const vs. non-const - write_const_1_nonconst_2 one_or_two; - const function0 v7(one_or_two); - function v8(one_or_two); - - global_int = 0; - v7(); - BOOST_TEST(global_int == 2); - - global_int = 0; - v8(); - BOOST_TEST(global_int == 2); - - // Test return values - typedef function0 func_int_type; - generate_five_obj gen_five; - generate_three_obj gen_three; - - func_int_type i0(gen_five); - - BOOST_TEST(i0() == 5); - i0 = gen_three; - BOOST_TEST(i0() == 3); - i0 = &generate_five; - BOOST_TEST(i0() == 5); - i0 = &generate_three; - BOOST_TEST(i0() == 3); - BOOST_TEST(i0? true : false); - i0.clear(); - BOOST_TEST(!i0? true : false); - - // Test return values with compatible types - typedef function0 func_long_type; - func_long_type i1(gen_five); - - BOOST_TEST(i1() == 5); - i1 = gen_three; - BOOST_TEST(i1() == 3); - i1 = &generate_five; - BOOST_TEST(i1() == 5); - i1 = &generate_three; - BOOST_TEST(i1() == 3); - BOOST_TEST(i1? true : false); - i1.clear(); - BOOST_TEST(!i1? true : false); -} - -static void -test_one_arg() -{ - negate neg; - - function1 f1(neg); - BOOST_TEST(f1(5) == -5); - - function1 id(&identity_str); - BOOST_TEST(id("str") == "str"); - - function1 id2(&identity_str); - BOOST_TEST(id2("foo") == "foo"); - - add_to_obj add_to(5); - function1 f2(add_to); - BOOST_TEST(f2(3) == 8); - - const function1 cf2(add_to); - BOOST_TEST(cf2(3) == 8); -} - -static void -test_two_args() -{ - function2 cat(&string_cat); - BOOST_TEST(cat("str", "ing") == "string"); - - function2 sum(&sum_ints); - BOOST_TEST(sum(2, 3) == 5); -} - -static void -test_emptiness() -{ - function0 f1; - BOOST_TEST(f1.empty()); - - function0 f2; - f2 = f1; - BOOST_TEST(f2.empty()); - - function0 f3; - f3 = f2; - BOOST_TEST(f3.empty()); -} - -struct X { - X(int v) : value(v) {} - - int twice() const { return 2*value; } - int plus(int v) { return value + v; } - - int value; -}; - -static void -test_member_functions() -{ - - boost::function1 f1(&X::twice); - - X one(1); - X five(5); - - BOOST_TEST(f1(&one) == 2); - BOOST_TEST(f1(&five) == 10); - - boost::function1 f1_2; - f1_2 = &X::twice; - - BOOST_TEST(f1_2(&one) == 2); - BOOST_TEST(f1_2(&five) == 10); - - boost::function2 f2(&X::plus); - BOOST_TEST(f2(one, 3) == 4); - BOOST_TEST(f2(five, 4) == 9); -} - -struct add_with_throw_on_copy { - int operator()(int x, int y) const { return x+y; } - - add_with_throw_on_copy() {} - - add_with_throw_on_copy(const add_with_throw_on_copy&) - { - throw std::runtime_error("But this CAN'T throw"); - } - - add_with_throw_on_copy& operator=(const add_with_throw_on_copy&) - { - throw std::runtime_error("But this CAN'T throw"); - } -}; - -static void -test_ref() -{ - add_with_throw_on_copy atc; - try { - boost::function2 f(ref(atc)); - BOOST_TEST(f(1, 3) == 4); - } - catch(std::runtime_error e) { - BOOST_ERROR("Nonthrowing constructor threw an exception"); - } -} - -int test_main(int, char* []) -{ - test_zero_args(); - test_one_arg(); - test_two_args(); - test_emptiness(); - test_member_functions(); - test_ref(); - return 0; -} diff --git a/test/function_test.cpp b/test/function_test.cpp deleted file mode 100644 index 50a072f..0000000 --- a/test/function_test.cpp +++ /dev/null @@ -1,710 +0,0 @@ -// Boost.Function library - -// Copyright (C) 2001 Doug Gregor (gregod@cs.rpi.edu) -// -// Permission to copy, use, sell and distribute this software is granted -// provided this copyright notice appears in all copies. -// Permission to modify the code and to distribute modified code is granted -// provided this copyright notice appears in all copies, and a notice -// that the code was modified is included with the copyright notice. -// -// This software is provided "as is" without express or implied warranty, -// and with no claim as to its suitability for any purpose. - -// For more information, see http://www.boost.org - -#define BOOST_INCLUDE_MAIN -#define BOOST_FUNCTION_NO_DEPRECATED -#include -#include -#include -#include -#include - -using namespace boost; -using namespace std; - -int global_int; - -struct write_five_obj { void operator()() const { global_int = 5; } }; -struct write_three_obj { int operator()() const { global_int = 3; return 7; }}; -static void write_five() { global_int = 5; } -static void write_three() { global_int = 3; } -struct generate_five_obj { int operator()() const { return 5; } }; -struct generate_three_obj { int operator()() const { return 3; } }; -static int generate_five() { return 5; } -static int generate_three() { return 3; } -static string identity_str(const string& s) { return s; } -static string string_cat(const string& s1, const string& s2) { return s1+s2; } -static int sum_ints(int x, int y) { return x+y; } - -struct write_const_1_nonconst_2 -{ - void operator()() { global_int = 2; } - void operator()() const { global_int = 1; } -}; - -struct add_to_obj -{ - add_to_obj(int v) : value(v) {} - - int operator()(int x) const { return value + x; } - - int value; -}; - -static void -test_zero_args() -{ - typedef function func_void_type; - - write_five_obj five; - write_three_obj three; - - // Default construction - func_void_type v1; - BOOST_TEST(v1.empty()); - - // Assignment to an empty function - v1 = five; - BOOST_TEST(!v1.empty()); - - // Invocation of a function - global_int = 0; - v1(); - BOOST_TEST(global_int == 5); - - // clear() method - v1.clear(); - BOOST_TEST(v1.empty()); - - // Assignment to an empty function - v1 = three; - BOOST_TEST(!v1.empty()); - - // Invocation and self-assignment - global_int = 0; - v1 = v1; - v1(); - BOOST_TEST(global_int == 3); - - // Assignment to a non-empty function - v1 = five; - - // Invocation and self-assignment - global_int = 0; - v1 = (v1); - v1(); - BOOST_TEST(global_int == 5); - - // clear() - v1.clear(); - BOOST_TEST(v1.empty()); - - // Assignment to an empty function from a free function - v1 = BOOST_FUNCTION_TARGET_FIX(&) write_five; - BOOST_TEST(!v1.empty()); - - // Invocation - global_int = 0; - v1(); - BOOST_TEST(global_int == 5); - - // Assignment to a non-empty function from a free function - v1 = BOOST_FUNCTION_TARGET_FIX(&) write_three; - BOOST_TEST(!v1.empty()); - - // Invocation - global_int = 0; - v1(); - BOOST_TEST(global_int == 3); - - // Assignment - v1 = five; - BOOST_TEST(!v1.empty()); - - // Invocation - global_int = 0; - v1(); - BOOST_TEST(global_int == 5); - - // Assignment to a non-empty function from a free function - v1 = &write_three; - BOOST_TEST(!v1.empty()); - - // Invocation - global_int = 0; - v1(); - BOOST_TEST(global_int == 3); - - // Construction from another function (that is empty) - v1.clear(); - func_void_type v2(v1); - BOOST_TEST(!v2? true : false); - - // Assignment to an empty function - v2 = three; - BOOST_TEST(!v2.empty()); - - // Invocation - global_int = 0; - v2(); - BOOST_TEST(global_int == 3); - - // Assignment to a non-empty function - v2 = (five); - - // Invocation - global_int = 0; - v2(); - BOOST_TEST(global_int == 5); - - v2.clear(); - BOOST_TEST(v2.empty()); - - // Assignment to an empty function from a free function - v2 = (BOOST_FUNCTION_TARGET_FIX(&) write_five); - BOOST_TEST(v2? true : false); - - // Invocation - global_int = 0; - v2(); - BOOST_TEST(global_int == 5); - - // Assignment to a non-empty function from a free function - v2 = BOOST_FUNCTION_TARGET_FIX(&) write_three; - BOOST_TEST(!v2.empty()); - - // Invocation - global_int = 0; - v2(); - BOOST_TEST(global_int == 3); - - // Swapping - v1 = five; - swap(v1, v2); - v2(); - BOOST_TEST(global_int == 5); - v1(); - BOOST_TEST(global_int == 3); - swap(v1, v2); - v1.clear(); - - // Assignment - v2 = five; - BOOST_TEST(!v2.empty()); - - // Invocation - global_int = 0; - v2(); - BOOST_TEST(global_int == 5); - - // Assignment to a non-empty function from a free function - v2 = &write_three; - BOOST_TEST(!v2.empty()); - - // Invocation - global_int = 0; - v2(); - BOOST_TEST(global_int == 3); - - // Assignment to a function from an empty function - v2 = v1; - BOOST_TEST(v2.empty()); - - // Assignment to a function from a function with a functor - v1 = three; - v2 = v1; - BOOST_TEST(!v1.empty()); - BOOST_TEST(!v2.empty()); - - // Invocation - global_int = 0; - v1(); - BOOST_TEST(global_int == 3); - global_int = 0; - v2(); - BOOST_TEST(global_int == 3); - - // Assign to a function from a function with a function - v2 = BOOST_FUNCTION_TARGET_FIX(&) write_five; - v1 = v2; - BOOST_TEST(!v1.empty()); - BOOST_TEST(!v2.empty()); - global_int = 0; - v1(); - BOOST_TEST(global_int == 5); - global_int = 0; - v2(); - BOOST_TEST(global_int == 5); - - // Construct a function given another function containing a function - func_void_type v3(v1); - - // Invocation of a function - global_int = 0; - v3(); - BOOST_TEST(global_int == 5); - - // clear() method - v3.clear(); - BOOST_TEST(!v3? true : false); - - // Assignment to an empty function - v3 = three; - BOOST_TEST(!v3.empty()); - - // Invocation - global_int = 0; - v3(); - BOOST_TEST(global_int == 3); - - // Assignment to a non-empty function - v3 = five; - - // Invocation - global_int = 0; - v3(); - BOOST_TEST(global_int == 5); - - // clear() - v3.clear(); - BOOST_TEST(v3.empty()); - - // Assignment to an empty function from a free function - v3 = &write_five; - BOOST_TEST(!v3.empty()); - - // Invocation - global_int = 0; - v3(); - BOOST_TEST(global_int == 5); - - // Assignment to a non-empty function from a free function - v3 = &write_three; - BOOST_TEST(!v3.empty()); - - // Invocation - global_int = 0; - v3(); - BOOST_TEST(global_int == 3); - - // Assignment - v3 = five; - BOOST_TEST(!v3.empty()); - - // Invocation - global_int = 0; - v3(); - BOOST_TEST(global_int == 5); - - // Construction of a function from a function containing a functor - func_void_type v4(v3); - - // Invocation of a function - global_int = 0; - v4(); - BOOST_TEST(global_int == 5); - - // clear() method - v4.clear(); - BOOST_TEST(v4.empty()); - - // Assignment to an empty function - v4 = three; - BOOST_TEST(!v4.empty()); - - // Invocation - global_int = 0; - v4(); - BOOST_TEST(global_int == 3); - - // Assignment to a non-empty function - v4 = five; - - // Invocation - global_int = 0; - v4(); - BOOST_TEST(global_int == 5); - - // clear() - v4.clear(); - BOOST_TEST(v4.empty()); - - // Assignment to an empty function from a free function - v4 = &write_five; - BOOST_TEST(!v4.empty()); - - // Invocation - global_int = 0; - v4(); - BOOST_TEST(global_int == 5); - - // Assignment to a non-empty function from a free function - v4 = &write_three; - BOOST_TEST(!v4.empty()); - - // Invocation - global_int = 0; - v4(); - BOOST_TEST(global_int == 3); - - // Assignment - v4 = five; - BOOST_TEST(!v4.empty()); - - // Invocation - global_int = 0; - v4(); - BOOST_TEST(global_int == 5); - - // Construction of a function from a functor - func_void_type v5(five); - - // Invocation of a function - global_int = 0; - v5(); - BOOST_TEST(global_int == 5); - - // clear() method - v5.clear(); - BOOST_TEST(v5.empty()); - - // Assignment to an empty function - v5 = three; - BOOST_TEST(!v5.empty()); - - // Invocation - global_int = 0; - v5(); - BOOST_TEST(global_int == 3); - - // Assignment to a non-empty function - v5 = five; - - // Invocation - global_int = 0; - v5(); - BOOST_TEST(global_int == 5); - - // clear() - v5.clear(); - BOOST_TEST(v5.empty()); - - // Assignment to an empty function from a free function - v5 = &write_five; - BOOST_TEST(!v5.empty()); - - // Invocation - global_int = 0; - v5(); - BOOST_TEST(global_int == 5); - - // Assignment to a non-empty function from a free function - v5 = &write_three; - BOOST_TEST(!v5.empty()); - - // Invocation - global_int = 0; - v5(); - BOOST_TEST(global_int == 3); - - // Assignment - v5 = five; - BOOST_TEST(!v5.empty()); - - // Invocation - global_int = 0; - v5(); - BOOST_TEST(global_int == 5); - - // Construction of a function from a function - func_void_type v6(&write_five); - - // Invocation of a function - global_int = 0; - v6(); - BOOST_TEST(global_int == 5); - - // clear() method - v6.clear(); - BOOST_TEST(v6.empty()); - - // Assignment to an empty function - v6 = three; - BOOST_TEST(!v6.empty()); - - // Invocation - global_int = 0; - v6(); - BOOST_TEST(global_int == 3); - - // Assignment to a non-empty function - v6 = five; - - // Invocation - global_int = 0; - v6(); - BOOST_TEST(global_int == 5); - - // clear() - v6.clear(); - BOOST_TEST(v6.empty()); - - // Assignment to an empty function from a free function - v6 = &write_five; - BOOST_TEST(!v6.empty()); - - // Invocation - global_int = 0; - v6(); - BOOST_TEST(global_int == 5); - - // Assignment to a non-empty function from a free function - v6 = &write_three; - BOOST_TEST(!v6.empty()); - - // Invocation - global_int = 0; - v6(); - BOOST_TEST(global_int == 3); - - // Assignment - v6 = five; - BOOST_TEST(!v6.empty()); - - // Invocation - global_int = 0; - v6(); - BOOST_TEST(global_int == 5); - - // Const vs. non-const - write_const_1_nonconst_2 one_or_two; - const function v7(one_or_two); - function v8(one_or_two); - - global_int = 0; - v7(); - BOOST_TEST(global_int == 2); - - global_int = 0; - v8(); - BOOST_TEST(global_int == 2); - - // Test return values - typedef function func_int_type; - generate_five_obj gen_five; - generate_three_obj gen_three; - - func_int_type i0(gen_five); - - BOOST_TEST(i0() == 5); - i0 = gen_three; - BOOST_TEST(i0() == 3); - i0 = &generate_five; - BOOST_TEST(i0() == 5); - i0 = &generate_three; - BOOST_TEST(i0() == 3); - BOOST_TEST(i0? true : false); - i0.clear(); - BOOST_TEST(!i0? true : false); - - // Test return values with compatible types - typedef function func_long_type; - func_long_type i1(gen_five); - - BOOST_TEST(i1() == 5); - i1 = gen_three; - BOOST_TEST(i1() == 3); - i1 = &generate_five; - BOOST_TEST(i1() == 5); - i1 = &generate_three; - BOOST_TEST(i1() == 3); - BOOST_TEST(i1? true : false); - i1.clear(); - BOOST_TEST(!i1? true : false); -} - -static void -test_one_arg() -{ - negate neg; - - function f1(neg); - BOOST_TEST(f1(5) == -5); - - function id(&identity_str); - BOOST_TEST(id("str") == "str"); - - function id2(&identity_str); - BOOST_TEST(id2("foo") == "foo"); - - add_to_obj add_to(5); - function f2(add_to); - BOOST_TEST(f2(3) == 8); - - const function cf2(add_to); - BOOST_TEST(cf2(3) == 8); -} - -static void -test_two_args() -{ - function cat(&string_cat); - BOOST_TEST(cat("str", "ing") == "string"); - - function sum(&sum_ints); - BOOST_TEST(sum(2, 3) == 5); -} - -static void -test_emptiness() -{ - function f1; - BOOST_TEST(f1.empty()); - - function f2; - f2 = f1; - BOOST_TEST(f2.empty()); - - function f3; - f3 = f2; - BOOST_TEST(f3.empty()); -} - -struct X { - X(int v) : value(v) {} - - int twice() const { return 2*value; } - int plus(int v) { return value + v; } - - int value; -}; - -static void -test_member_functions() -{ - boost::function f1(&X::twice); - - X one(1); - X five(5); - - BOOST_TEST(f1(&one) == 2); - BOOST_TEST(f1(&five) == 10); - - boost::function f1_2; - f1_2 = &X::twice; - - BOOST_TEST(f1_2(&one) == 2); - BOOST_TEST(f1_2(&five) == 10); - - boost::function f2(&X::plus); - BOOST_TEST(f2(one, 3) == 4); - BOOST_TEST(f2(five, 4) == 9); -} - -struct add_with_throw_on_copy { - int operator()(int x, int y) const { return x+y; } - - add_with_throw_on_copy() {} - - add_with_throw_on_copy(const add_with_throw_on_copy&) - { - throw runtime_error("But this CAN'T throw"); - } - - add_with_throw_on_copy& operator=(const add_with_throw_on_copy&) - { - throw runtime_error("But this CAN'T throw"); - } -}; - -static void -test_ref() -{ - add_with_throw_on_copy atc; - try { - boost::function f(ref(atc)); - BOOST_TEST(f(1, 3) == 4); - } - catch(runtime_error e) { - BOOST_ERROR("Nonthrowing constructor threw an exception"); - } -} - -static int alloc_count = 0; -static int dealloc_count = 0; - -template -struct counting_allocator : public allocator -{ - template - struct rebind - { - typedef counting_allocator other; - }; - - - T* allocate(size_t n) - { - alloc_count++; - return allocator::allocate(n); - } - - void deallocate(T* p, size_t n) - { - dealloc_count++; - allocator::deallocate(p, n); - } -}; - -static int do_minus(int x, int y) { return x-y; } - -struct DoNothing -{ - void operator()() const {} -}; - -static void do_nothing() {} - -static void test_allocator() -{ -#ifndef BOOST_NO_STD_ALLOCATOR - boost::function > f; - f = plus(); - f.clear(); - BOOST_TEST(alloc_count == 1); - BOOST_TEST(dealloc_count == 1); - - alloc_count = 0; - dealloc_count = 0; - f = &do_minus; - f.clear(); - - boost::function > fv; - alloc_count = 0; - dealloc_count = 0; - fv = DoNothing(); - fv.clear(); - BOOST_TEST(alloc_count == 1); - BOOST_TEST(dealloc_count == 1); - - alloc_count = 0; - dealloc_count = 0; - fv = &do_nothing; - fv.clear(); -#endif // ndef BOOST_NO_STD_ALLOCATOR -} - -int test_main(int, char* []) -{ - test_zero_args(); - test_one_arg(); - test_two_args(); - test_emptiness(); - test_member_functions(); - test_ref(); - test_allocator(); - - return 0; -} diff --git a/test/function_test_fail1.cpp b/test/function_test_fail1.cpp deleted file mode 100644 index 3f85e26..0000000 --- a/test/function_test_fail1.cpp +++ /dev/null @@ -1,35 +0,0 @@ -// Boost.Function library - -// Copyright (C) 2001 Doug Gregor (gregod@cs.rpi.edu) -// -// Permission to copy, use, sell and distribute this software is granted -// provided this copyright notice appears in all copies. -// Permission to modify the code and to distribute modified code is granted -// provided this copyright notice appears in all copies, and a notice -// that the code was modified is included with the copyright notice. -// -// This software is provided "as is" without express or implied warranty, -// and with no claim as to its suitability for any purpose. - -// For more information, see http://www.boost.org - -#define BOOST_INCLUDE_MAIN -#include -#include - -using namespace std; -using namespace boost; - -int -test_main(int, char*[]) -{ - function f1; - function f2; - - if (f1 == f2) { - } - - BOOST_CRITICAL_ERROR("This should not have compiled."); - - return 0; -} diff --git a/test/function_test_fail2.cpp b/test/function_test_fail2.cpp deleted file mode 100644 index 620ba38..0000000 --- a/test/function_test_fail2.cpp +++ /dev/null @@ -1,34 +0,0 @@ -// Boost.Function library - -// Copyright (C) 2001 Doug Gregor (gregod@cs.rpi.edu) -// -// Permission to copy, use, sell and distribute this software is granted -// provided this copyright notice appears in all copies. -// Permission to modify the code and to distribute modified code is granted -// provided this copyright notice appears in all copies, and a notice -// that the code was modified is included with the copyright notice. -// -// This software is provided "as is" without express or implied warranty, -// and with no claim as to its suitability for any purpose. - -// For more information, see http://www.boost.org - -#define BOOST_INCLUDE_MAIN -#include -#include - -using namespace std; -using namespace boost; - -static int bad_fn(float f) { return static_cast(f); } - -int -test_main(int, char*[]) -{ - function f1; - f1 = bad_fn; - - BOOST_CRITICAL_ERROR("This should not have compiled."); - - return 0; -} diff --git a/test/mixin_test.cpp b/test/mixin_test.cpp deleted file mode 100644 index 61c7200..0000000 --- a/test/mixin_test.cpp +++ /dev/null @@ -1,60 +0,0 @@ -// Boost.Function library - -// Copyright (C) 2001 Doug Gregor (gregod@cs.rpi.edu) -// -// Permission to copy, use, sell and distribute this software is granted -// provided this copyright notice appears in all copies. -// Permission to modify the code and to distribute modified code is granted -// provided this copyright notice appears in all copies, and a notice -// that the code was modified is included with the copyright notice. -// -// This software is provided "as is" without express or implied warranty, -// and with no claim as to its suitability for any purpose. - -// For more information, see http://www.boost.org - -#define BOOST_INCLUDE_MAIN -#include -#include -#include -#include - -struct id_mixin -{ - id_mixin(const id_mixin& rhs) : id(rhs.id) {} - id_mixin& operator=(const id_mixin& rhs){id = rhs.id; return *this;} - id_mixin(int i = 0){ id = i;} - int id; -}; - -static int do_plus(int x, int y) { return x+y; } - -typedef boost::function::mixin::type func; - -int test_main(int, char*[]) -{ - func f(id_mixin(3)); - f = std::plus(); - BOOST_TEST(f.id == 3); - - f = &do_plus; - BOOST_TEST(f.id == 3); - - f.clear(); - f.id = 7; - BOOST_TEST(f.id == 7); - - func g(f); - BOOST_TEST(g.id == 7); - - f.id = 21; - BOOST_TEST(f.id == 21); - - boost::swap(f,g); - BOOST_TEST(f.id == 7); - BOOST_TEST(g.id == 21); - - g = f; - BOOST_TEST(g.id == 7); - return 0; -} diff --git a/test/policy_test.cpp b/test/policy_test.cpp deleted file mode 100644 index cee8f93..0000000 --- a/test/policy_test.cpp +++ /dev/null @@ -1,47 +0,0 @@ -// Boost.Function library - -// Copyright (C) 2001 Doug Gregor (gregod@cs.rpi.edu) -// -// Permission to copy, use, sell and distribute this software is granted -// provided this copyright notice appears in all copies. -// Permission to modify the code and to distribute modified code is granted -// provided this copyright notice appears in all copies, and a notice -// that the code was modified is included with the copyright notice. -// -// This software is provided "as is" without express or implied warranty, -// and with no claim as to its suitability for any purpose. - -// For more information, see http://www.boost.org - -#define BOOST_INCLUDE_MAIN -#include -#include -#include -#include -#include - -using namespace std; -using namespace boost; - -struct counting_policy -{ - static int count; - - void precall(const function_base*) { count++; } - void postcall(const function_base*) { count+=2; } -}; - -int counting_policy::count = 0; - -int -test_main(int, char*[]) -{ - function::policy::type f; - - f = plus(); - - BOOST_TEST(5 == f(2,3)); - BOOST_TEST(counting_policy::count==3); - - return 0; -} diff --git a/test/regression.cfg b/test/regression.cfg deleted file mode 100644 index 7e44253..0000000 --- a/test/regression.cfg +++ /dev/null @@ -1,14 +0,0 @@ -// Boost.Function regression test configuration file - -// From the boost/status directory, run -// ./regression --tests ../libs/function/test/regression.cfg -o function.html - - -run libs/function/test/allocator_test.cpp -run libs/function/test/function_n_test.cpp -run libs/function/test/function_test.cpp -compile-fail libs/function/test/function_test_fail1.cpp -compile-fail libs/function/test/function_test_fail2.cpp -run libs/function/test/mixin_test.cpp -run libs/function/test/policy_test.cpp -run libs/function/test/stateless_test.cpp diff --git a/test/stateless_test.cpp b/test/stateless_test.cpp deleted file mode 100644 index 91a4b7d..0000000 --- a/test/stateless_test.cpp +++ /dev/null @@ -1,47 +0,0 @@ -// Boost.Function library - -// Copyright (C) 2001 Doug Gregor (gregod@cs.rpi.edu) -// -// Permission to copy, use, sell and distribute this software is granted -// provided this copyright notice appears in all copies. -// Permission to modify the code and to distribute modified code is granted -// provided this copyright notice appears in all copies, and a notice -// that the code was modified is included with the copyright notice. -// -// This software is provided "as is" without express or implied warranty, -// and with no claim as to its suitability for any purpose. - -// For more information, see http://www.boost.org - -#define BOOST_INCLUDE_MAIN -#include -#include -#include - -struct stateless_integer_add { - int operator()(int x, int y) const { return x+y; } - - void* operator new(std::size_t, stateless_integer_add*) - { - throw std::runtime_error("Cannot allocate a stateless_integer_add"); - } - - void operator delete(void*, stateless_integer_add*) - { - } -}; - -namespace boost { - template<> - struct is_stateless { - BOOST_STATIC_CONSTANT(bool, value = true); - }; -} - -int test_main(int, char*[]) -{ - boost::function f; - f = stateless_integer_add(); - - return 0; -}