diff --git a/doc/Jamfile.v2 b/doc/Jamfile.v2 deleted file mode 100644 index a0f0612..0000000 --- a/doc/Jamfile.v2 +++ /dev/null @@ -1,5 +0,0 @@ -project boost/doc ; -import boostbook : boostbook ; - -boostbook function-doc : function.xml ; - diff --git a/doc/faq.xml b/doc/faq.xml deleted file mode 100644 index c9e9ac6..0000000 --- a/doc/faq.xml +++ /dev/null @@ -1,56 +0,0 @@ - - -
- Frequently Asked Questions - - - - 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). - - - - - 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(); } - - - 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. - - - - - - 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. - - - - -
diff --git a/doc/function.xml b/doc/function.xml deleted file mode 100644 index 210f0e1..0000000 --- a/doc/function.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - Douglas - Gregor - gregod@cs.rpi.edu - - - - 2001 - 2002 - 2003 - Douglas Gregor - - - - 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. - - - Function object wrappers for deferred calls or callbacks - - - -Boost.Function - -
-Introduction -The Boost.Function library contains 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. -
- - - - - - - - - diff --git a/doc/history.xml b/doc/history.xml deleted file mode 100644 index 63fb44e..0000000 --- a/doc/history.xml +++ /dev/null @@ -1,87 +0,0 @@ - - -
- History & Compatibility Notes - - - Version 1.30.0: - - All features deprecated in version 1.29.0 have - been removed from Boost.Function. - - boost::function - and boost::functionN objects - can be assigned to 0 (semantically equivalent to calling - clear()) and - compared against 0 (semantically equivalent to calling - empty()). - - The Boost.Function code is now generated - entirely by the Preprocessor library, - so it is now possible to generate - boost::function and - boost::functionN class - templates for any number of arguments. - - The - boost::bad_function_call exception class - was introduced. - - - - Version 1.29.0: - 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. - - - - -
diff --git a/doc/misc.xml b/doc/misc.xml deleted file mode 100644 index 29807de..0000000 --- a/doc/misc.xml +++ /dev/null @@ -1,65 +0,0 @@ - - -
- Miscellaneous Notes - -
- 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 behavior when an empty function object is called. - - - 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. - - -
- -
- 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). -
-
- -
- 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. Peter Dimov led us to the function - declarator-based syntax. -
-
diff --git a/doc/reference.xml b/doc/reference.xml deleted file mode 100644 index ce1f402..0000000 --- a/doc/reference.xml +++ /dev/null @@ -1,503 +0,0 @@ - - - - - -
- Definitions - - - - A function object f is - compatible if for the given set of argument - types Arg1, - Arg2, ..., - ArgN and a - return type ResultType, the - appropriate following function is well-formed: - - // if ResultType is not void - ResultType foo(Arg1 arg1, Arg2 arg2, ..., ArgN argN) - { - return f(arg1, arg2, ..., argN); - } - - // if ResultType is void - ResultType foo(Arg1 arg1, Arg2 arg2, ..., ArgN argN) - { - f(arg1, arg2, ..., argN); - } - - - A special provision is made for pointers to member - functions. Though they are not function objects, Boost.Function - will adapt them internally to function objects. This requires - that a pointer to member function of the form R - (X::*mf)(Arg1, Arg2, ..., ArgN) - cv-quals be adapted to a - function object with the following function call operator - overloads: - - template<typename P> - R operator()(cv-quals P& x, Arg1 arg1, Arg2 arg2, ..., ArgN argN) const - { - return (*x).*mf(arg1, arg2, ..., argN); - } - - - - - A function object f of - type F is - stateless if it is a function pointer or if - boost::is_stateless<T> - is true. The construction of or copy to a Boost.Function object - from a stateless function object will not cause exceptions to be - thrown and will not allocate any storage. - - - - -
- -
- - - std::runtime_error - An exception type thrown when an instance of a function object is empty when invoked. - - Constructs a bad_function_call exception object. - - - - - The common base class for all Boost.Function - objects. Objects of type function_base may not be created - directly. - - - - bool - true if this has a target, and false otherwise. - Will not throw. - - - - - - - - function_base - - A set of generalized function pointers that can be used for callbacks or wrapping function objects. - - - 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. - - - R - Allocator - - T1If N == 1 - - - T1 - If N == 2 - - - T2 - If N == 2 - - T1 - T2 - - TN - - - int - N - - - - - - - Lambda library support - - - result_type - - - - this->empty() - Will not throw. - - - - - const functionN& - - Contains a copy of the f's target, if it has one, or is empty if f.empty(). - Will not throw unless copying the target of f throws. - - - - - F - F is a function object Callable from this. - *this targets a copy of f if f is nonempty, or this->empty() if f is empty. - Will not throw when f is a stateless function object. - - - - If !this->empty(), destroys the target of this. - - - - - - const functionN& - - *this targets a copy of f's target, if it has one, or is empty if f.empty(). - Will not throw when the target of f is a stateless function object or a reference to the function object. - - - - - void - const functionN& - Interchanges the targets of *this and f. - Will not throw. - - - - void - this->empty() - Will not throw. - - - - - - bool - true if this has a target, and false otherwise. - Will not throw. - - - - safe_bool - A safe_bool that evaluates false in a boolean context when this->empty(), and true otherwise. - Will not throw. - - - - bool - this->empty() - Will not throw. - - - - - - result_type - arg1_type - arg2_type - ... - argN_type - f(a1, a2, ..., aN), where f is the target of *this. - if R is void, nothing is returned; otherwise, the return value of the call to f is returned. - bad_function_call if !this->empty(). Otherwise, may through any exception thrown by the target function f. - - - - - - - void - functionN<T1, T2, ..., TN, Allocator>& - functionN<T1, T2, ..., TN, Allocator>& - f1.swap(f2) - Will not throw. - - - - - - - void - const functionN<T1, T2, ..., TN, Allocator1>& - const functionN<U1, U2, ..., UN, Allocator2>& - This function must be left undefined. - The safe_bool conversion opens a loophole whereby two function instances can be compared via ==. This undefined void operator == closes the loophole and ensures a compile-time or link-time error. - - - - - void - const functionN<T1, T2, ..., TN, Allocator1>& - const functionN<U1, U2, ..., UN, Allocator2>& - This function must be left undefined. - The safe_bool conversion opens a loophole whereby two function instances can be compared via !=. This undefined void operator != closes the loophole and ensures a compile-time or link-time error. - - - - - - - functionN<R, T1, T2, ..., TN, Allocator> - - A generalized function pointer that can be used for - callbacks or wrapping function objects. - - - Class template function is a thin - wrapper around the numbered class templates function0, function1, etc. It accepts a - function type with N arguments and will will derive from - functionN instantiated 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. - - - R - Allocator - - T1If N == 1 - - - T1 - If N == 2 - - - T2 - If N == 2 - - T1 - T2 - - TN - - - int - N - - - - - - - Lambda library support - - - result_type - - - - this->empty() - Will not throw. - - - - - const functionN& - - Contains a copy of the f's target, if it has one, or is empty if f.empty(). - Will not throw unless copying the target of f throws. - - - - - const function& - - Contains a copy of the f's target, if it has one, or is empty if f.empty(). - Will not throw unless copying the target of f throws. - - - - - F - F is a function object Callable from this. - *this targets a copy of f if f is nonempty, or this->empty() if f is empty. - Will not throw when f is a stateless function object. - - - - If !this->empty(), destroys the target of this. - - - - - - const functionN& - - *this targets a copy of f's target, if it has one, or is empty if f.empty() - Will not throw when the target of f is a stateless function object or a reference to the function object. - - - - - const function& - - *this targets a copy of f's target, if it has one, or is empty if f.empty() - Will not throw when the target of f is a stateless function object or a reference to the function object. - - - - - void - const function& - Interchanges the targets of *this and f. - Will not throw. - - - - void - this->empty() - Will not throw. - - - - - - bool - true if this has a target, and false otherwise. - Will not throw. - - - - safe_bool - A safe_bool that evaluates false in a boolean context when this->empty(), and true otherwise. - Will not throw. - - - - bool - this->empty() - Will not throw. - - - - - - result_type - arg1_type - arg2_type - ... - argN_type - f(a1, a2, ..., aN), where f is the target of *this. - if R is void, nothing is returned; otherwise, the return value of the call to f is returned. - bad_function_call if !this->empty(). Otherwise, may through any exception thrown by the target function f. - - - - - - - void - function<Signature, Allocator>& - function<Signature, Allocator>& - f1.swap(f2) - Will not throw. - - - - - - - void - const function<Signature1, Allocator1>& - const function<Signature2, Allocator2>& - This function must be left undefined. - The safe_bool conversion opens a loophole whereby two function instances can be compared via ==. This undefined void operator == closes the loophole and ensures a compile-time or link-time error. - - - - - void - const function<Signature1, Allocator1>& - const function<Signature2, Allocator2>& - This function must be left undefined. - The safe_bool conversion opens a loophole whereby two function instances can be compared via !=. This undefined void operator != closes the loophole and ensures a compile-time or link-time error. - - - - -
- diff --git a/doc/tests.xml b/doc/tests.xml deleted file mode 100644 index 3a34722..0000000 --- a/doc/tests.xml +++ /dev/null @@ -1,248 +0,0 @@ - - - - - Test the capabilities of the boost::function class template. - The boost::function class template may not be usable on your compiler. However, the library may still be usable via the boost::functionN class templates. - - - - Test the capabilities of the boost::functionN class templates. - - - - ../../../libs/test/build/boost_test_exec_monitor - Test the use of custom allocators. - Allocators are ignored by the implementation. - - - - ../../../libs/test/build/boost_test_exec_monitor - Test the optimization of stateless function objects in the Boost.Function library. - The exception-safety and performance guarantees given for stateless function objects may not be met by the implementation. - - - - ../../../libs/test/build/boost_test_exec_monitor - Test the interaction between Boost.Function and Boost.Lambda. - Either Boost.Lambda does not work on the platform, or Boost.Function cannot safely be applied without the use of boost::unlambda. - - - - Test the (incorrect!) use of comparisons between Boost.Function function objects. - Intuitive (but incorrect!) code may compile and will give meaningless results. - - - - Test the use of an incompatible function object with Boost.Function - Incorrect code may compile (with potentially unexpected results). - - - - Test the generation of a Boost.Function function object adaptor accepting 30 arguments. - The Boost.Function library may work for function object adaptors of up to 10 parameters, but will be unable to generate adaptors for an arbitrary number of parameters. Failure often indicates an error in the compiler's preprocessor. - - - - - -#include -]]> - - - - -int main() -{ - - - - - - - - return 0; -} - - Test the first tutorial example. - - - - - -#include -]]> - - -int main() -{ - - - - - - - - return 0; -} - - Test the first tutorial example. - - - - - -#include -]]> - -int main() -{ - - - - return 0; -} - - Test the second tutorial example. - - - - - -#include -]]> - -int main() -{ - - - - return 0; -} - - Test the second tutorial example. - - - - - -#include -#include -]]> - -int X::foo(int x) { return -x; } - -int main() -{ - - - return 0; -} - - Test member function example from tutorial. - - - - - -#include -#include -]]> - -int X::foo(int x) { return -x; } - -int main() -{ - - - return 0; -} - - Test member function example from tutorial. - - - - - -#include -#include -]]> - -int X::foo(int x) { return -x; } - -int main() -{ - - - return 0; -} - - Test standard binders example from tutorial. - - - - - -#include -#include -]]> - -int X::foo(int x) { return -x; } - -int main() -{ - - - return 0; -} - - Test standard binders example from tutorial. - - - - - -#include -]]> - -struct stateful_type { int operator()(int) const { return 0; } }; - -int main() -{ - - - return 0; -} - - Test boost::ref example from tutorial. - - - - - -#include -]]> - -struct stateful_type { int operator()(int) const { return 0; } }; - -int main() -{ - - - return 0; -} - - Test boost::ref example from tutorial. - - diff --git a/doc/tutorial.xml b/doc/tutorial.xml deleted file mode 100644 index e1f8337..0000000 --- a/doc/tutorial.xml +++ /dev/null @@ -1,324 +0,0 @@ - - -
-Tutorial - - - - Boost.Function has two syntactical forms: the preferred form -and the portable 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 syntax - Portable 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 - - - - - Any compiler supporting the preferred syntax - 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 syntax - Portable 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 syntax - - - -boost::function<void (int values[], int n, int& sum, float& avg)> sum_avg; - - - - - - - - Portable syntax - - - -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, and will throw a bad_function_call exception). We can check for an -empty function object wrapper by using it in a boolean context (it evaluates true if the wrapper is not empty) or compare it against 0. For instance: -if (f) - std::cout << f(5, 3) << std::endl; -else - std::cout << "f has no target, so it is unsafe to call" << std::endl; - - - Alternatively, -empty() -method will return whether or not the wrapper is empty. - - Finally, we can clear out a function target by assigning it to 0 or by calling the clear() member function, e.g., -f = 0; - - -
- -
- 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: - -struct X { - int foo(int); -}; - - - - - - Preferred syntax - Portable syntax - - - - - -boost::function<int (X*, int)> f; - -f = &X::foo; - -X x; -f(&x, 5); - - -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: - - Bind. This library allows binding of - arguments for any function object. It is lightweight and very - portable. - - The C++ Standard library. Using - std::bind1st and - std::mem_fun together one can bind - the object of a pointer-to-member function for use with - Boost.Function: - - - - - - Preferred syntax - Portable syntax - - - - - - boost::function<int (int)> f; - X x; - f = std::bind1st( - std::mem_fun(&X::foo), &x); - f(5); // Call x.foo(5) - - - boost::function1<int, int> f; - X x; - f = std::bind1st( - std::mem_fun(&X::foo), &x); - f(5); // Call x.foo(5) - - - - - - - - - The Lambda library. This library provides a powerful composition mechanism to construct function objects that uses very natural C++ syntax. Lambda requires a compiler that is reasonably conformant to the C++ standard. - - - -
- -
- 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 syntax - Portable syntax - - - - - - stateful_type a_function_object; - boost::function<int (int)> f; - f = boost::ref(a_function_object); - - boost::function<int (int)> f2(f); - - - stateful_type a_function_object; - boost::function1<int, int> f; - f = boost::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. - -
-
- 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/detail/function_iterate.hpp b/include/boost/function/detail/function_iterate.hpp deleted file mode 100644 index 4587b94..0000000 --- a/include/boost/function/detail/function_iterate.hpp +++ /dev/null @@ -1,22 +0,0 @@ -// Boost.Function library - -// Copyright (C) 2002-2003 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 -#if !defined(BOOST_PP_IS_ITERATING) -# error Boost.Function - do not include this file! -#endif - -#define BOOST_FUNCTION_NUM_ARGS BOOST_PP_ITERATION() -#include -#undef BOOST_FUNCTION_NUM_ARGS - diff --git a/include/boost/function/detail/gen_maybe_include.pl b/include/boost/function/detail/gen_maybe_include.pl deleted file mode 100644 index 4e8d4ca..0000000 --- a/include/boost/function/detail/gen_maybe_include.pl +++ /dev/null @@ -1,37 +0,0 @@ -#!/usr/bin/perl -w -# -# Boost.Function library -# -# Copyright (C) 2001-2003 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; - -$max_args = $ARGV[0]; - -open (OUT, ">maybe_include.hpp") or die("Cannot write to maybe_include.hpp"); -for($on_arg = 0; $on_arg <= $max_args; ++$on_arg) { - if ($on_arg == 0) { - print OUT "#if"; - } - else { - print OUT "#elif"; - } - print OUT " BOOST_FUNCTION_NUM_ARGS == $on_arg\n"; - print OUT "# ifndef BOOST_FUNCTION_$on_arg\n"; - print OUT "# define BOOST_FUNCTION_$on_arg\n"; - print OUT "# include \n"; - print OUT "# endif\n"; -} -print OUT "#else\n"; -print OUT "# error Cannot handle Boost.Function objects that accept more than $max_args arguments!\n"; -print OUT "#endif\n"; diff --git a/include/boost/function/detail/maybe_include.hpp b/include/boost/function/detail/maybe_include.hpp deleted file mode 100644 index 83d82cb..0000000 --- a/include/boost/function/detail/maybe_include.hpp +++ /dev/null @@ -1,273 +0,0 @@ -// Boost.Function library - -// Copyright (C) 2003 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 - -#if BOOST_FUNCTION_NUM_ARGS == 0 -# ifndef BOOST_FUNCTION_0 -# define BOOST_FUNCTION_0 -# include -# endif -#elif BOOST_FUNCTION_NUM_ARGS == 1 -# ifndef BOOST_FUNCTION_1 -# define BOOST_FUNCTION_1 -# include -# endif -#elif BOOST_FUNCTION_NUM_ARGS == 2 -# ifndef BOOST_FUNCTION_2 -# define BOOST_FUNCTION_2 -# include -# endif -#elif BOOST_FUNCTION_NUM_ARGS == 3 -# ifndef BOOST_FUNCTION_3 -# define BOOST_FUNCTION_3 -# include -# endif -#elif BOOST_FUNCTION_NUM_ARGS == 4 -# ifndef BOOST_FUNCTION_4 -# define BOOST_FUNCTION_4 -# include -# endif -#elif BOOST_FUNCTION_NUM_ARGS == 5 -# ifndef BOOST_FUNCTION_5 -# define BOOST_FUNCTION_5 -# include -# endif -#elif BOOST_FUNCTION_NUM_ARGS == 6 -# ifndef BOOST_FUNCTION_6 -# define BOOST_FUNCTION_6 -# include -# endif -#elif BOOST_FUNCTION_NUM_ARGS == 7 -# ifndef BOOST_FUNCTION_7 -# define BOOST_FUNCTION_7 -# include -# endif -#elif BOOST_FUNCTION_NUM_ARGS == 8 -# ifndef BOOST_FUNCTION_8 -# define BOOST_FUNCTION_8 -# include -# endif -#elif BOOST_FUNCTION_NUM_ARGS == 9 -# ifndef BOOST_FUNCTION_9 -# define BOOST_FUNCTION_9 -# include -# endif -#elif BOOST_FUNCTION_NUM_ARGS == 10 -# ifndef BOOST_FUNCTION_10 -# define BOOST_FUNCTION_10 -# include -# endif -#elif BOOST_FUNCTION_NUM_ARGS == 11 -# ifndef BOOST_FUNCTION_11 -# define BOOST_FUNCTION_11 -# include -# endif -#elif BOOST_FUNCTION_NUM_ARGS == 12 -# ifndef BOOST_FUNCTION_12 -# define BOOST_FUNCTION_12 -# include -# endif -#elif BOOST_FUNCTION_NUM_ARGS == 13 -# ifndef BOOST_FUNCTION_13 -# define BOOST_FUNCTION_13 -# include -# endif -#elif BOOST_FUNCTION_NUM_ARGS == 14 -# ifndef BOOST_FUNCTION_14 -# define BOOST_FUNCTION_14 -# include -# endif -#elif BOOST_FUNCTION_NUM_ARGS == 15 -# ifndef BOOST_FUNCTION_15 -# define BOOST_FUNCTION_15 -# include -# endif -#elif BOOST_FUNCTION_NUM_ARGS == 16 -# ifndef BOOST_FUNCTION_16 -# define BOOST_FUNCTION_16 -# include -# endif -#elif BOOST_FUNCTION_NUM_ARGS == 17 -# ifndef BOOST_FUNCTION_17 -# define BOOST_FUNCTION_17 -# include -# endif -#elif BOOST_FUNCTION_NUM_ARGS == 18 -# ifndef BOOST_FUNCTION_18 -# define BOOST_FUNCTION_18 -# include -# endif -#elif BOOST_FUNCTION_NUM_ARGS == 19 -# ifndef BOOST_FUNCTION_19 -# define BOOST_FUNCTION_19 -# include -# endif -#elif BOOST_FUNCTION_NUM_ARGS == 20 -# ifndef BOOST_FUNCTION_20 -# define BOOST_FUNCTION_20 -# include -# endif -#elif BOOST_FUNCTION_NUM_ARGS == 21 -# ifndef BOOST_FUNCTION_21 -# define BOOST_FUNCTION_21 -# include -# endif -#elif BOOST_FUNCTION_NUM_ARGS == 22 -# ifndef BOOST_FUNCTION_22 -# define BOOST_FUNCTION_22 -# include -# endif -#elif BOOST_FUNCTION_NUM_ARGS == 23 -# ifndef BOOST_FUNCTION_23 -# define BOOST_FUNCTION_23 -# include -# endif -#elif BOOST_FUNCTION_NUM_ARGS == 24 -# ifndef BOOST_FUNCTION_24 -# define BOOST_FUNCTION_24 -# include -# endif -#elif BOOST_FUNCTION_NUM_ARGS == 25 -# ifndef BOOST_FUNCTION_25 -# define BOOST_FUNCTION_25 -# include -# endif -#elif BOOST_FUNCTION_NUM_ARGS == 26 -# ifndef BOOST_FUNCTION_26 -# define BOOST_FUNCTION_26 -# include -# endif -#elif BOOST_FUNCTION_NUM_ARGS == 27 -# ifndef BOOST_FUNCTION_27 -# define BOOST_FUNCTION_27 -# include -# endif -#elif BOOST_FUNCTION_NUM_ARGS == 28 -# ifndef BOOST_FUNCTION_28 -# define BOOST_FUNCTION_28 -# include -# endif -#elif BOOST_FUNCTION_NUM_ARGS == 29 -# ifndef BOOST_FUNCTION_29 -# define BOOST_FUNCTION_29 -# include -# endif -#elif BOOST_FUNCTION_NUM_ARGS == 30 -# ifndef BOOST_FUNCTION_30 -# define BOOST_FUNCTION_30 -# include -# endif -#elif BOOST_FUNCTION_NUM_ARGS == 31 -# ifndef BOOST_FUNCTION_31 -# define BOOST_FUNCTION_31 -# include -# endif -#elif BOOST_FUNCTION_NUM_ARGS == 32 -# ifndef BOOST_FUNCTION_32 -# define BOOST_FUNCTION_32 -# include -# endif -#elif BOOST_FUNCTION_NUM_ARGS == 33 -# ifndef BOOST_FUNCTION_33 -# define BOOST_FUNCTION_33 -# include -# endif -#elif BOOST_FUNCTION_NUM_ARGS == 34 -# ifndef BOOST_FUNCTION_34 -# define BOOST_FUNCTION_34 -# include -# endif -#elif BOOST_FUNCTION_NUM_ARGS == 35 -# ifndef BOOST_FUNCTION_35 -# define BOOST_FUNCTION_35 -# include -# endif -#elif BOOST_FUNCTION_NUM_ARGS == 36 -# ifndef BOOST_FUNCTION_36 -# define BOOST_FUNCTION_36 -# include -# endif -#elif BOOST_FUNCTION_NUM_ARGS == 37 -# ifndef BOOST_FUNCTION_37 -# define BOOST_FUNCTION_37 -# include -# endif -#elif BOOST_FUNCTION_NUM_ARGS == 38 -# ifndef BOOST_FUNCTION_38 -# define BOOST_FUNCTION_38 -# include -# endif -#elif BOOST_FUNCTION_NUM_ARGS == 39 -# ifndef BOOST_FUNCTION_39 -# define BOOST_FUNCTION_39 -# include -# endif -#elif BOOST_FUNCTION_NUM_ARGS == 40 -# ifndef BOOST_FUNCTION_40 -# define BOOST_FUNCTION_40 -# include -# endif -#elif BOOST_FUNCTION_NUM_ARGS == 41 -# ifndef BOOST_FUNCTION_41 -# define BOOST_FUNCTION_41 -# include -# endif -#elif BOOST_FUNCTION_NUM_ARGS == 42 -# ifndef BOOST_FUNCTION_42 -# define BOOST_FUNCTION_42 -# include -# endif -#elif BOOST_FUNCTION_NUM_ARGS == 43 -# ifndef BOOST_FUNCTION_43 -# define BOOST_FUNCTION_43 -# include -# endif -#elif BOOST_FUNCTION_NUM_ARGS == 44 -# ifndef BOOST_FUNCTION_44 -# define BOOST_FUNCTION_44 -# include -# endif -#elif BOOST_FUNCTION_NUM_ARGS == 45 -# ifndef BOOST_FUNCTION_45 -# define BOOST_FUNCTION_45 -# include -# endif -#elif BOOST_FUNCTION_NUM_ARGS == 46 -# ifndef BOOST_FUNCTION_46 -# define BOOST_FUNCTION_46 -# include -# endif -#elif BOOST_FUNCTION_NUM_ARGS == 47 -# ifndef BOOST_FUNCTION_47 -# define BOOST_FUNCTION_47 -# include -# endif -#elif BOOST_FUNCTION_NUM_ARGS == 48 -# ifndef BOOST_FUNCTION_48 -# define BOOST_FUNCTION_48 -# include -# endif -#elif BOOST_FUNCTION_NUM_ARGS == 49 -# ifndef BOOST_FUNCTION_49 -# define BOOST_FUNCTION_49 -# include -# endif -#elif BOOST_FUNCTION_NUM_ARGS == 50 -# ifndef BOOST_FUNCTION_50 -# define BOOST_FUNCTION_50 -# include -# endif -#else -# error Cannot handle Boost.Function objects that accept more than 50 arguments! -#endif diff --git a/include/boost/function/detail/prologue.hpp b/include/boost/function/detail/prologue.hpp deleted file mode 100644 index 5960134..0000000 --- a/include/boost/function/detail/prologue.hpp +++ /dev/null @@ -1,30 +0,0 @@ -// Boost.Function library - -// Copyright (C) 2002-2003 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_PROLOGUE_HPP -#define BOOST_FUNCTION_PROLOGUE_HPP -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -#endif // BOOST_FUNCTION_PROLOGUE_HPP diff --git a/include/boost/function/function0.hpp b/include/boost/function/function0.hpp deleted file mode 100644 index 133030a..0000000 --- a/include/boost/function/function0.hpp +++ /dev/null @@ -1,18 +0,0 @@ -// Boost.Function library - -// Copyright (C) 2002-2003 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_FUNCTION_NUM_ARGS 0 -#include -#undef BOOST_FUNCTION_NUM_ARGS diff --git a/include/boost/function/function1.hpp b/include/boost/function/function1.hpp deleted file mode 100644 index 6c71d78..0000000 --- a/include/boost/function/function1.hpp +++ /dev/null @@ -1,18 +0,0 @@ -// Boost.Function library - -// Copyright (C) 2002-2003 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_FUNCTION_NUM_ARGS 1 -#include -#undef BOOST_FUNCTION_NUM_ARGS diff --git a/include/boost/function/function10.hpp b/include/boost/function/function10.hpp deleted file mode 100644 index 736d1cd..0000000 --- a/include/boost/function/function10.hpp +++ /dev/null @@ -1,18 +0,0 @@ -// Boost.Function library - -// Copyright (C) 2002-2003 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_FUNCTION_NUM_ARGS 10 -#include -#undef BOOST_FUNCTION_NUM_ARGS diff --git a/include/boost/function/function2.hpp b/include/boost/function/function2.hpp deleted file mode 100644 index ca07250..0000000 --- a/include/boost/function/function2.hpp +++ /dev/null @@ -1,18 +0,0 @@ -// Boost.Function library - -// Copyright (C) 2002-2003 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_FUNCTION_NUM_ARGS 2 -#include -#undef BOOST_FUNCTION_NUM_ARGS diff --git a/include/boost/function/function3.hpp b/include/boost/function/function3.hpp deleted file mode 100644 index f1047c2..0000000 --- a/include/boost/function/function3.hpp +++ /dev/null @@ -1,18 +0,0 @@ -// Boost.Function library - -// Copyright (C) 2002-2003 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_FUNCTION_NUM_ARGS 3 -#include -#undef BOOST_FUNCTION_NUM_ARGS diff --git a/include/boost/function/function4.hpp b/include/boost/function/function4.hpp deleted file mode 100644 index bf74976..0000000 --- a/include/boost/function/function4.hpp +++ /dev/null @@ -1,18 +0,0 @@ -// Boost.Function library - -// Copyright (C) 2002-2003 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_FUNCTION_NUM_ARGS 4 -#include -#undef BOOST_FUNCTION_NUM_ARGS diff --git a/include/boost/function/function5.hpp b/include/boost/function/function5.hpp deleted file mode 100644 index 8cbc3b0..0000000 --- a/include/boost/function/function5.hpp +++ /dev/null @@ -1,18 +0,0 @@ -// Boost.Function library - -// Copyright (C) 2002-2003 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_FUNCTION_NUM_ARGS 5 -#include -#undef BOOST_FUNCTION_NUM_ARGS diff --git a/include/boost/function/function6.hpp b/include/boost/function/function6.hpp deleted file mode 100644 index 541b205..0000000 --- a/include/boost/function/function6.hpp +++ /dev/null @@ -1,18 +0,0 @@ -// Boost.Function library - -// Copyright (C) 2002-2003 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_FUNCTION_NUM_ARGS 6 -#include -#undef BOOST_FUNCTION_NUM_ARGS diff --git a/include/boost/function/function7.hpp b/include/boost/function/function7.hpp deleted file mode 100644 index abd56fb..0000000 --- a/include/boost/function/function7.hpp +++ /dev/null @@ -1,18 +0,0 @@ -// Boost.Function library - -// Copyright (C) 2002-2003 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_FUNCTION_NUM_ARGS 7 -#include -#undef BOOST_FUNCTION_NUM_ARGS diff --git a/include/boost/function/function8.hpp b/include/boost/function/function8.hpp deleted file mode 100644 index 1bce61a..0000000 --- a/include/boost/function/function8.hpp +++ /dev/null @@ -1,18 +0,0 @@ -// Boost.Function library - -// Copyright (C) 2002-2003 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_FUNCTION_NUM_ARGS 8 -#include -#undef BOOST_FUNCTION_NUM_ARGS diff --git a/include/boost/function/function9.hpp b/include/boost/function/function9.hpp deleted file mode 100644 index 9b87add..0000000 --- a/include/boost/function/function9.hpp +++ /dev/null @@ -1,18 +0,0 @@ -// Boost.Function library - -// Copyright (C) 2002-2003 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_FUNCTION_NUM_ARGS 9 -#include -#undef BOOST_FUNCTION_NUM_ARGS diff --git a/include/boost/function/function_base.hpp b/include/boost/function/function_base.hpp deleted file mode 100644 index d4f700c..0000000 --- a/include/boost/function/function_base.hpp +++ /dev/null @@ -1,416 +0,0 @@ -// Boost.Function library - -// Copyright (C) 2001-2003 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 -#include -#include -#include - -#if defined(BOOST_MSVC) && BOOST_MSVC <= 1300 || defined(__ICL) && __ICL <= 600 || defined(__MWERKS__) && __MWERKS__ < 0x2406 && !defined(BOOST_STRICT_CONFIG) -# define BOOST_FUNCTION_TARGET_FIX(x) x -#else -# define BOOST_FUNCTION_TARGET_FIX(x) -#endif // not MSVC - -#if defined(__sgi) && defined(_COMPILER_VERSION) && _COMPILER_VERSION <= 730 && !defined(BOOST_STRICT_CONFIG) -// Work around a compiler bug. -// boost::python::objects::function has to be seen by the compiler before the -// boost::function class template. -namespace boost { namespace python { namespace objects { - class function; -}}} -#endif - -// GCC 2.95.3 (or earlier) doesn't support enable_if -#if BOOST_WORKAROUND(__GNUC__, < 3) -# define BOOST_FUNCTION_NO_ENABLE_IF -#endif - -// MIPSpro 7.3.1.3m doesn't support enable_if -#if defined(__sgi) && defined(_COMPILER_VERSION) && _COMPILER_VERSION <= 730 && !defined(BOOST_STRICT_CONFIG) -# define BOOST_FUNCTION_NO_ENABLE_IF -#endif - -// MSVC 7.0 doesn't support enable_if -#if defined(BOOST_MSVC) && BOOST_MSVC <= 1300 && !defined(BOOST_STRICT_CONFIG) -# define BOOST_FUNCTION_NO_ENABLE_IF -#endif - -// Borland C++ 5.6.0 doesn't support enable_if -#if BOOST_WORKAROUND(__BORLANDC__, <= 0x564) -# define BOOST_FUNCTION_NO_ENABLE_IF -#endif - -// Metrowerks 7.2 doesn't support enable_if -#if BOOST_WORKAROUND(__MWERKS__, <= 0x2407) -# define BOOST_FUNCTION_NO_ENABLE_IF -#endif - -#if BOOST_WORKAROUND(__SUNPRO_CC, <= 0x540) -# define BOOST_FUNCTION_NO_ENABLE_IF -#endif - -#if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) -namespace boost { - -#if defined(__sgi) && defined(_COMPILER_VERSION) && _COMPILER_VERSION <= 730 && !defined(BOOST_STRICT_CONFIG) -// The library shipping with MIPSpro 7.3.1.3m has a broken allocator -class function_base; - -template > -class function; -#else -template > -class function; -#endif - -template -inline void swap(function& f1, - function& f2) -{ - f1.swap(f2); -} - -} // end namespace boost -#endif // have partial specialization - -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)(); - char data[1]; - }; - - inline any_pointer make_any_pointer(void* o) - { - any_pointer p; - p.obj_ptr = o; - return p; - } - - inline any_pointer make_any_pointer(const void* o) - { - any_pointer p; - p.const_obj_ptr = o; - return p; - } - - inline any_pointer make_any_pointer(void (*f)()) - { - any_pointer p; - p.func_ptr = f; - return 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 make_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 make_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 make_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 make_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()); - } - }; - -#ifndef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION - template struct enable_if; - template struct enable_if { typedef T type; }; - template struct enable_if {}; - - template - struct enabled - { - template - struct base - { - typedef T type; - }; - }; - - template<> - struct enabled - { - template - struct base - { - }; - }; - - template - struct enable_if : public enabled::template base - { - }; -#endif - - // A type that is only used for comparisons against zero - struct useless_clear_type {}; - } // 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.obj_ptr = 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; -}; - -/** - * The bad_function_call exception class is thrown when a boost::function - * object is invoked - */ -class bad_function_call : public std::runtime_error -{ -public: - bad_function_call() : std::runtime_error("call to empty boost::function") {} -}; - -/* 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&); - -#if BOOST_WORKAROUND(BOOST_MSVC, <= 1300) -inline bool operator==(const function_base& f, - detail::function::useless_clear_type*) -{ - return f.empty(); -} - -inline bool operator!=(const function_base& f, - detail::function::useless_clear_type*) -{ - return !f.empty(); -} - -inline bool operator==(detail::function::useless_clear_type*, - const function_base& f) -{ - return f.empty(); -} - -inline bool operator!=(detail::function::useless_clear_type*, - const function_base& f) -{ - return !f.empty(); -} -#endif - -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 -} // end namespace boost - -#endif // BOOST_FUNCTION_BASE_HEADER diff --git a/include/boost/function/function_template.hpp b/include/boost/function/function_template.hpp deleted file mode 100644 index d0e569a..0000000 --- a/include/boost/function/function_template.hpp +++ /dev/null @@ -1,674 +0,0 @@ -// Boost.Function library - -// Copyright (C) 2001-2003 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 - -// Note: this header is a header template and must NOT have multiple-inclusion -// protection. -#include - -#define BOOST_FUNCTION_TEMPLATE_PARMS BOOST_PP_ENUM_PARAMS(BOOST_FUNCTION_NUM_ARGS, typename T) - -#define BOOST_FUNCTION_TEMPLATE_ARGS BOOST_PP_ENUM_PARAMS(BOOST_FUNCTION_NUM_ARGS, T) - -#define BOOST_FUNCTION_PARM(J,I,D) BOOST_PP_CAT(T,I) BOOST_PP_CAT(a,I) - -#define BOOST_FUNCTION_PARMS BOOST_PP_ENUM(BOOST_FUNCTION_NUM_ARGS,BOOST_FUNCTION_PARM,BOOST_PP_EMPTY) - -#define BOOST_FUNCTION_ARGS BOOST_PP_ENUM_PARAMS(BOOST_FUNCTION_NUM_ARGS, a) - -#define BOOST_FUNCTION_ARG_TYPE(J,I,D) \ - typedef BOOST_PP_CAT(T,I) BOOST_PP_CAT(arg, BOOST_PP_CAT(BOOST_PP_INC(I),_type)); - -#define BOOST_FUNCTION_ARG_TYPES BOOST_PP_REPEAT(BOOST_FUNCTION_NUM_ARGS,BOOST_FUNCTION_ARG_TYPE,BOOST_PP_EMPTY) - -// Type of the default allocator -#ifndef BOOST_NO_STD_ALLOCATOR -# define BOOST_FUNCTION_DEFAULT_ALLOCATOR std::allocator -#else -# define BOOST_FUNCTION_DEFAULT_ALLOCATOR int -#endif // BOOST_NO_STD_ALLOCATOR - -// Comma if nonzero number of arguments -#if BOOST_FUNCTION_NUM_ARGS == 0 -# define BOOST_FUNCTION_COMMA -#else -# define BOOST_FUNCTION_COMMA , -#endif // BOOST_FUNCTION_NUM_ARGS > 0 - -// Class names used in this version of the code -#define BOOST_FUNCTION_FUNCTION BOOST_JOIN(function,BOOST_FUNCTION_NUM_ARGS) -#define BOOST_FUNCTION_FUNCTION_INVOKER \ - BOOST_JOIN(function_invoker,BOOST_FUNCTION_NUM_ARGS) -#define BOOST_FUNCTION_VOID_FUNCTION_INVOKER \ - BOOST_JOIN(void_function_invoker,BOOST_FUNCTION_NUM_ARGS) -#define BOOST_FUNCTION_FUNCTION_OBJ_INVOKER \ - BOOST_JOIN(function_obj_invoker,BOOST_FUNCTION_NUM_ARGS) -#define BOOST_FUNCTION_VOID_FUNCTION_OBJ_INVOKER \ - BOOST_JOIN(void_function_obj_invoker,BOOST_FUNCTION_NUM_ARGS) -#define BOOST_FUNCTION_STATELESS_FUNCTION_OBJ_INVOKER \ - BOOST_JOIN(stateless_function_obj_invoker,BOOST_FUNCTION_NUM_ARGS) -#define BOOST_FUNCTION_STATELESS_VOID_FUNCTION_OBJ_INVOKER \ - BOOST_JOIN(stateless_void_function_obj_invoker,BOOST_FUNCTION_NUM_ARGS) -#define BOOST_FUNCTION_GET_FUNCTION_INVOKER \ - BOOST_JOIN(get_function_invoker,BOOST_FUNCTION_NUM_ARGS) -#define BOOST_FUNCTION_GET_FUNCTION_OBJ_INVOKER \ - BOOST_JOIN(get_function_obj_invoker,BOOST_FUNCTION_NUM_ARGS) -#define BOOST_FUNCTION_GET_STATELESS_FUNCTION_OBJ_INVOKER \ - BOOST_JOIN(get_stateless_function_obj_invoker,BOOST_FUNCTION_NUM_ARGS) - -namespace boost { - namespace detail { - namespace function { - template< - typename FunctionPtr, - typename R BOOST_FUNCTION_COMMA - BOOST_FUNCTION_TEMPLATE_PARMS - > - struct BOOST_FUNCTION_FUNCTION_INVOKER - { - static R invoke(any_pointer function_ptr BOOST_FUNCTION_COMMA - BOOST_FUNCTION_PARMS) - { - FunctionPtr f = reinterpret_cast(function_ptr.func_ptr); - return f(BOOST_FUNCTION_ARGS); - } - }; - - template< - typename FunctionPtr, - typename R BOOST_FUNCTION_COMMA - BOOST_FUNCTION_TEMPLATE_PARMS - > - struct BOOST_FUNCTION_VOID_FUNCTION_INVOKER - { - static unusable invoke(any_pointer function_ptr BOOST_FUNCTION_COMMA - BOOST_FUNCTION_PARMS) - - { - FunctionPtr f = reinterpret_cast(function_ptr.func_ptr); - f(BOOST_FUNCTION_ARGS); - return unusable(); - } - }; - - template< - typename FunctionObj, - typename R BOOST_FUNCTION_COMMA - BOOST_FUNCTION_TEMPLATE_PARMS - > - struct BOOST_FUNCTION_FUNCTION_OBJ_INVOKER - { - static R invoke(any_pointer function_obj_ptr BOOST_FUNCTION_COMMA - BOOST_FUNCTION_PARMS) - - { - FunctionObj* f = (FunctionObj*)(function_obj_ptr.obj_ptr); - return (*f)(BOOST_FUNCTION_ARGS); - } - }; - - template< - typename FunctionObj, - typename R BOOST_FUNCTION_COMMA - BOOST_FUNCTION_TEMPLATE_PARMS - > - struct BOOST_FUNCTION_VOID_FUNCTION_OBJ_INVOKER - { - static unusable invoke(any_pointer function_obj_ptr - BOOST_FUNCTION_COMMA - BOOST_FUNCTION_PARMS) - - { - FunctionObj* f = (FunctionObj*)(function_obj_ptr.obj_ptr); - (*f)(BOOST_FUNCTION_ARGS); - return unusable(); - } - }; - - template< - typename FunctionObj, - typename R BOOST_FUNCTION_COMMA - BOOST_FUNCTION_TEMPLATE_PARMS - > - struct BOOST_FUNCTION_STATELESS_FUNCTION_OBJ_INVOKER - { - static R invoke(any_pointer BOOST_FUNCTION_COMMA BOOST_FUNCTION_PARMS) - { - FunctionObj f = FunctionObj(); - return f(BOOST_FUNCTION_ARGS); - } - }; - - template< - typename FunctionObj, - typename R BOOST_FUNCTION_COMMA - BOOST_FUNCTION_TEMPLATE_PARMS - > - struct BOOST_FUNCTION_STATELESS_VOID_FUNCTION_OBJ_INVOKER - { - static unusable invoke(any_pointer BOOST_FUNCTION_COMMA - BOOST_FUNCTION_PARMS) - - { - FunctionObj f = FunctionObj(); - f(BOOST_FUNCTION_ARGS); - return unusable(); - } - }; - - template< - typename FunctionPtr, - typename R BOOST_FUNCTION_COMMA - BOOST_FUNCTION_TEMPLATE_PARMS - > - struct BOOST_FUNCTION_GET_FUNCTION_INVOKER - { - typedef typename ct_if<(is_void::value), - BOOST_FUNCTION_VOID_FUNCTION_INVOKER< - FunctionPtr, - R BOOST_FUNCTION_COMMA - BOOST_FUNCTION_TEMPLATE_ARGS - >, - BOOST_FUNCTION_FUNCTION_INVOKER< - FunctionPtr, - R BOOST_FUNCTION_COMMA - BOOST_FUNCTION_TEMPLATE_ARGS - > - >::type type; - }; - - template< - typename FunctionObj, - typename R BOOST_FUNCTION_COMMA - BOOST_FUNCTION_TEMPLATE_PARMS - > - struct BOOST_FUNCTION_GET_FUNCTION_OBJ_INVOKER - { - typedef typename ct_if<(is_void::value), - BOOST_FUNCTION_VOID_FUNCTION_OBJ_INVOKER< - FunctionObj, - R BOOST_FUNCTION_COMMA - BOOST_FUNCTION_TEMPLATE_ARGS - >, - BOOST_FUNCTION_FUNCTION_OBJ_INVOKER< - FunctionObj, - R BOOST_FUNCTION_COMMA - BOOST_FUNCTION_TEMPLATE_ARGS - > - >::type type; - }; - - template< - typename FunctionObj, - typename R BOOST_FUNCTION_COMMA - BOOST_FUNCTION_TEMPLATE_PARMS - > - struct BOOST_FUNCTION_GET_STATELESS_FUNCTION_OBJ_INVOKER - { - typedef typename ct_if<(is_void::value), - BOOST_FUNCTION_STATELESS_VOID_FUNCTION_OBJ_INVOKER< - FunctionObj, - R BOOST_FUNCTION_COMMA - BOOST_FUNCTION_TEMPLATE_ARGS - >, - BOOST_FUNCTION_STATELESS_FUNCTION_OBJ_INVOKER< - FunctionObj, - R BOOST_FUNCTION_COMMA - BOOST_FUNCTION_TEMPLATE_ARGS - > - >::type type; - }; - - } // end namespace function - } // end namespace detail - - template< - typename R BOOST_FUNCTION_COMMA - BOOST_FUNCTION_TEMPLATE_PARMS, - typename Allocator = BOOST_FUNCTION_DEFAULT_ALLOCATOR - > - class BOOST_FUNCTION_FUNCTION : public function_base - { - typedef typename detail::function::function_return_type::type - internal_result_type; - - struct clear_type {}; - - public: - BOOST_STATIC_CONSTANT(int, args = BOOST_FUNCTION_NUM_ARGS); - - // add signature for boost::lambda - template - struct sig - { - typedef internal_result_type type; - }; - -#if BOOST_FUNCTION_NUM_ARGS == 1 - typedef T0 argument_type; -#elif BOOST_FUNCTION_NUM_ARGS == 2 - typedef T0 first_argument_type; - typedef T1 second_argument_type; -#endif - - BOOST_STATIC_CONSTANT(int, arity = BOOST_FUNCTION_NUM_ARGS); - BOOST_FUNCTION_ARG_TYPES - -#ifndef BOOST_NO_VOID_RETURNS - typedef R result_type; -#else - typedef internal_result_type result_type; -#endif // BOOST_NO_VOID_RETURNS - typedef Allocator allocator_type; - typedef BOOST_FUNCTION_FUNCTION self_type; - - BOOST_FUNCTION_FUNCTION() : function_base() - , invoker(0) {} - - // MSVC chokes if the following two constructors are collapsed into - // one with a default parameter. - template - BOOST_FUNCTION_FUNCTION(Functor BOOST_FUNCTION_TARGET_FIX(const &) f -#ifndef BOOST_FUNCTION_NO_ENABLE_IF - ,typename detail::function::enable_if< - (::boost::type_traits::ice_not< - (is_same::value)>::value), - int>::type = 0 -#endif // BOOST_FUNCTION_NO_ENABLE_IF - ) : - function_base(), - invoker(0) - { - this->assign_to(f); - } - -#ifndef BOOST_FUNCTION_NO_ENABLE_IF - BOOST_FUNCTION_FUNCTION(clear_type*) : function_base(), invoker(0) {} -#else - BOOST_FUNCTION_FUNCTION(int zero) : function_base(), invoker(0) - { - BOOST_ASSERT(zero == 0); - } -#endif - - BOOST_FUNCTION_FUNCTION(const BOOST_FUNCTION_FUNCTION& f) : - function_base(), - invoker(0) - { - this->assign_to_own(f); - } - - ~BOOST_FUNCTION_FUNCTION() { clear(); } - - result_type operator()(BOOST_FUNCTION_PARMS) const - { - if (this->empty()) - boost::throw_exception(bad_function_call()); - - internal_result_type result = invoker(function_base::functor - BOOST_FUNCTION_COMMA - BOOST_FUNCTION_ARGS); - -#ifndef BOOST_NO_VOID_RETURNS - return static_cast(result); -#else - return result; -#endif // BOOST_NO_VOID_RETURNS - } - - // The distinction between when to use BOOST_FUNCTION_FUNCTION and - // when to use self_type is obnoxious. MSVC cannot handle self_type as - // the return type of these assignment operators, but Borland C++ cannot - // handle BOOST_FUNCTION_FUNCTION as the type of the temporary to - // construct. - template -#ifndef BOOST_FUNCTION_NO_ENABLE_IF - typename detail::function::enable_if< - (::boost::type_traits::ice_not< - (is_same::value)>::value), - BOOST_FUNCTION_FUNCTION&>::type -#else - BOOST_FUNCTION_FUNCTION& -#endif - operator=(Functor BOOST_FUNCTION_TARGET_FIX(const &) f) - { - self_type(f).swap(*this); - return *this; - } - -#ifndef BOOST_FUNCTION_NO_ENABLE_IF - BOOST_FUNCTION_FUNCTION& operator=(clear_type*) - { - this->clear(); - return *this; - } -#else - BOOST_FUNCTION_FUNCTION& operator=(int zero) - { - BOOST_ASSERT(zero == 0); - this->clear(); - return *this; - } -#endif - - // Assignment from another BOOST_FUNCTION_FUNCTION - BOOST_FUNCTION_FUNCTION& operator=(const BOOST_FUNCTION_FUNCTION& f) - { - if (&f == this) - return *this; - - self_type(f).swap(*this); - return *this; - } - - void swap(BOOST_FUNCTION_FUNCTION& other) - { - if (&other == this) - return; - - std::swap(function_base::manager, other.manager); - std::swap(function_base::functor, other.functor); - std::swap(invoker, other.invoker); - } - - // Clear out a target, if there is one - void clear() - { - if (function_base::manager) { - function_base::functor = - function_base::manager(function_base::functor, - detail::function::destroy_functor_tag); - } - - function_base::manager = 0; - invoker = 0; - } - -#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; } - - bool operator!() const - { return this->empty(); } -#endif - - private: - void assign_to_own(const BOOST_FUNCTION_FUNCTION& f) - { - if (!f.empty()) { - invoker = f.invoker; - function_base::manager = f.manager; - function_base::functor = - f.manager(f.functor, detail::function::clone_functor_tag); - } - } - - template - void assign_to(Functor f) - { - typedef typename detail::function::get_function_tag::type tag; - this->assign_to(f, tag()); - } - - template - void assign_to(FunctionPtr f, detail::function::function_ptr_tag) - { - clear(); - - if (f) { - typedef typename detail::function::BOOST_FUNCTION_GET_FUNCTION_INVOKER< - FunctionPtr, - R BOOST_FUNCTION_COMMA - BOOST_FUNCTION_TEMPLATE_ARGS - >::type - invoker_type; - - invoker = &invoker_type::invoke; - function_base::manager = - &detail::function::functor_manager::manage; - function_base::functor = - function_base::manager(detail::function::make_any_pointer( - // should be a reinterpret cast, but some compilers - // insist on giving cv-qualifiers to free functions - (void (*)())(f) - ), - detail::function::clone_functor_tag); - } - } - -#if BOOST_FUNCTION_NUM_ARGS > 0 - template - void assign_to(MemberPtr f, detail::function::member_ptr_tag) - { - this->assign_to(mem_fn(f)); - } -#endif // BOOST_FUNCTION_NUM_ARGS > 0 - - template - void assign_to(FunctionObj f, detail::function::function_obj_tag) - { - if (!detail::function::has_empty_target(addressof(f))) { - typedef - typename detail::function::BOOST_FUNCTION_GET_FUNCTION_OBJ_INVOKER< - FunctionObj, - R BOOST_FUNCTION_COMMA - BOOST_FUNCTION_TEMPLATE_ARGS - >::type - invoker_type; - - invoker = &invoker_type::invoke; - function_base::manager = &detail::function::functor_manager< - FunctionObj, Allocator>::manage; -#ifndef BOOST_NO_STD_ALLOCATOR - typedef typename Allocator::template rebind::other - allocator_type; - typedef typename allocator_type::pointer pointer_type; - allocator_type allocator; - pointer_type copy = allocator.allocate(1); - allocator.construct(copy, f); - - // Get back to the original pointer type - FunctionObj* new_f = static_cast(copy); -#else - FunctionObj* new_f = new FunctionObj(f); -#endif // BOOST_NO_STD_ALLOCATOR - function_base::functor = - detail::function::make_any_pointer(static_cast(new_f)); - } - } - - template - void assign_to(const reference_wrapper& f, - detail::function::function_obj_ref_tag) - { - if (!detail::function::has_empty_target(f.get_pointer())) { - typedef - typename detail::function::BOOST_FUNCTION_GET_FUNCTION_OBJ_INVOKER< - FunctionObj, - R BOOST_FUNCTION_COMMA - BOOST_FUNCTION_TEMPLATE_ARGS - >::type - invoker_type; - - invoker = &invoker_type::invoke; - function_base::manager = &detail::function::trivial_manager; - function_base::functor = - function_base::manager( - detail::function::make_any_pointer( - const_cast(f.get_pointer())), - detail::function::clone_functor_tag); - } - } - - template - void assign_to(FunctionObj, detail::function::stateless_function_obj_tag) - { - typedef - typename detail::function:: - BOOST_FUNCTION_GET_STATELESS_FUNCTION_OBJ_INVOKER< - FunctionObj, - R BOOST_FUNCTION_COMMA - BOOST_FUNCTION_TEMPLATE_ARGS - >::type - invoker_type; - invoker = &invoker_type::invoke; - function_base::manager = &detail::function::trivial_manager; - function_base::functor = detail::function::make_any_pointer(this); - } - - typedef internal_result_type (*invoker_type)(detail::function::any_pointer - BOOST_FUNCTION_COMMA - BOOST_FUNCTION_TEMPLATE_ARGS); - - invoker_type invoker; - }; - - template - inline void swap(BOOST_FUNCTION_FUNCTION< - R BOOST_FUNCTION_COMMA - BOOST_FUNCTION_TEMPLATE_ARGS , - Allocator - >& f1, - BOOST_FUNCTION_FUNCTION< - R BOOST_FUNCTION_COMMA - BOOST_FUNCTION_TEMPLATE_ARGS, - Allocator - >& f2) - { - f1.swap(f2); - } - -#if !defined (BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) \ - && !defined(BOOST_BCB_PARTIAL_SPECIALIZATION_BUG) \ - && (BOOST_STRICT_CONFIG || !defined(__SUNPRO_CC) || __SUNPRO_CC > 0x540) - -#if BOOST_FUNCTION_NUM_ARGS == 0 -#define BOOST_FUNCTION_PARTIAL_SPEC R (void) -#else -#define BOOST_FUNCTION_PARTIAL_SPEC R (BOOST_PP_ENUM_PARAMS(BOOST_FUNCTION_NUM_ARGS,T)) -#endif - -template -class function - : public BOOST_FUNCTION_FUNCTION -{ - typedef BOOST_FUNCTION_FUNCTION base_type; - typedef function self_type; - - struct clear_type {}; - -public: - typedef typename base_type::allocator_type allocator_type; - - function() : base_type() {} - - template - function(Functor f -#ifndef BOOST_FUNCTION_NO_ENABLE_IF - ,typename detail::function::enable_if< - (::boost::type_traits::ice_not< - (is_same::value)>::value), - int>::type = 0 -#endif - ) : - base_type(f) - { - } - -#ifndef BOOST_FUNCTION_NO_ENABLE_IF - function(clear_type*) : base_type() {} -#endif - - function(const self_type& f) : base_type(static_cast(f)){} - - function(const base_type& f) : base_type(static_cast(f)){} - - self_type& operator=(const self_type& f) - { - self_type(f).swap(*this); - return *this; - } - - template -#ifndef BOOST_FUNCTION_NO_ENABLE_IF - typename detail::function::enable_if< - (::boost::type_traits::ice_not< - (is_same::value)>::value), - self_type&>::type -#else - self_type& -#endif - operator=(Functor f) - { - self_type(f).swap(*this); - return *this; - } - -#ifndef BOOST_FUNCTION_NO_ENABLE_IF - self_type& operator=(clear_type*) - { - this->clear(); - return *this; - } -#endif - - self_type& operator=(const base_type& f) - { - self_type(f).swap(*this); - return *this; - } -}; - -#undef BOOST_FUNCTION_PARTIAL_SPEC -#endif // have partial specialization - -} // end namespace boost - -// Cleanup after ourselves... -#undef BOOST_FUNCTION_DEFAULT_ALLOCATOR -#undef BOOST_FUNCTION_COMMA -#undef BOOST_FUNCTION_FUNCTION -#undef BOOST_FUNCTION_FUNCTION_INVOKER -#undef BOOST_FUNCTION_VOID_FUNCTION_INVOKER -#undef BOOST_FUNCTION_FUNCTION_OBJ_INVOKER -#undef BOOST_FUNCTION_VOID_FUNCTION_OBJ_INVOKER -#undef BOOST_FUNCTION_STATELESS_FUNCTION_OBJ_INVOKER -#undef BOOST_FUNCTION_STATELESS_VOID_FUNCTION_OBJ_INVOKER -#undef BOOST_FUNCTION_GET_FUNCTION_INVOKER -#undef BOOST_FUNCTION_GET_FUNCTION_OBJ_INVOKER -#undef BOOST_FUNCTION_GET_STATELESS_FUNCTION_OBJ_INVOKER -#undef BOOST_FUNCTION_GET_MEM_FUNCTION_INVOKER -#undef BOOST_FUNCTION_TEMPLATE_PARMS -#undef BOOST_FUNCTION_TEMPLATE_ARGS -#undef BOOST_FUNCTION_PARMS -#undef BOOST_FUNCTION_PARM -#undef BOOST_FUNCTION_ARGS -#undef BOOST_FUNCTION_ARG_TYPE -#undef BOOST_FUNCTION_ARG_TYPES diff --git a/include/boost/function/gen_function_N.pl b/include/boost/function/gen_function_N.pl deleted file mode 100644 index 0b20392..0000000 --- a/include/boost/function/gen_function_N.pl +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/perl -w -# -# Boost.Function library -# -# Copyright (C) 2001-2003 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 "#define BOOST_FUNCTION_NUM_ARGS $numArgs\n"; - print OUT "#include \n"; - print OUT "#undef BOOST_FUNCTION_NUM_ARGS\n"; - close OUT; -} diff --git a/index.html b/index.html deleted file mode 100644 index 221f49e..0000000 --- a/index.html +++ /dev/null @@ -1,9 +0,0 @@ - - - - - -Automatic redirection failed, please go to -../../doc/html/function.html - - diff --git a/test/Jamfile b/test/Jamfile deleted file mode 100644 index 20f2887..0000000 --- a/test/Jamfile +++ /dev/null @@ -1,69 +0,0 @@ -# Function library - -# Copyright (C) 2001-2003 Douglas Gregor - -# 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/ - - -# Testing Jamfile autogenerated from XML source -subproject libs/function/test ; - -# bring in rules for testing -SEARCH on testing.jam = $(BOOST_BUILD_PATH) ; -include testing.jam ; - -# Make tests run by default. -DEPENDS all : test ; - -{ - # look in BOOST_ROOT for sources first, just in this Jamfile - local SEARCH_SOURCE = $(BOOST_ROOT) $(SEARCH_SOURCE) ; - - test-suite function - : - [ run libs/function/test/function_test.cpp : : : : lib_function_test ] - - [ run libs/function/test/function_n_test.cpp : : : : ] - - [ run libs/function/test/allocator_test.cpp ../../../libs/test/build/boost_test_exec_monitor : : : : ] - - [ run libs/function/test/stateless_test.cpp ../../../libs/test/build/boost_test_exec_monitor : : : : ] - - [ run libs/function/test/lambda_test.cpp ../../../libs/test/build/boost_test_exec_monitor : : : : ] - - [ compile-fail libs/function/test/function_test_fail1.cpp : : : : ] - - [ compile-fail libs/function/test/function_test_fail2.cpp : : : : ] - - [ compile libs/function/test/function_30.cpp : : : : ] - - [ run libs/function/test/function_arith_cxx98.cpp : : : : ] - - [ run libs/function/test/function_arith_portable.cpp : : : : ] - - [ run libs/function/test/sum_avg_cxx98.cpp : : : : ] - - [ run libs/function/test/sum_avg_portable.cpp : : : : ] - - [ run libs/function/test/mem_fun_cxx98.cpp : : : : ] - - [ run libs/function/test/mem_fun_portable.cpp : : : : ] - - [ run libs/function/test/std_bind_cxx98.cpp : : : : ] - - [ run libs/function/test/std_bind_portable.cpp : : : : ] - - [ run libs/function/test/function_ref_cxx98.cpp : : : : ] - - [ run libs/function/test/function_ref_portable.cpp : : : : ] - ; -} - \ No newline at end of file diff --git a/test/allocator_test.cpp b/test/allocator_test.cpp deleted file mode 100644 index 1809db1..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*[]) -{ - function2 > 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(); - - function0 > 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/function_30.cpp b/test/function_30.cpp deleted file mode 100644 index 1fd96ed..0000000 --- a/test/function_30.cpp +++ /dev/null @@ -1,31 +0,0 @@ -// Boost.Function library - -// Copyright (C) 2002-2003 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 - -// Make sure we don't try to redefine function2 -#include - -// Define all Boost.Function class templates up to 30 arguments -#define BOOST_FUNCTION_MAX_ARGS 30 -#include - -int main() -{ - boost::function0 f0; - - boost::function30 f30; - return 0; -} diff --git a/test/function_arith_cxx98.cpp b/test/function_arith_cxx98.cpp deleted file mode 100644 index 8903f72..0000000 --- a/test/function_arith_cxx98.cpp +++ /dev/null @@ -1,38 +0,0 @@ -// Function library - -// Copyright (C) 2001-2003 Douglas Gregor - -// 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 - - -float mul_ints(int x, int y) { return ((float)x) * y; } -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; - if (f) - std::cout << f(5, 3) << std::endl; -else - std::cout << "f has no target, so it is unsafe to call" << std::endl; - f = 0; - f = &mul_ints; - - return 0; -} diff --git a/test/function_arith_portable.cpp b/test/function_arith_portable.cpp deleted file mode 100644 index 3bbc112..0000000 --- a/test/function_arith_portable.cpp +++ /dev/null @@ -1,36 +0,0 @@ -// Function library - -// Copyright (C) 2001-2003 Douglas Gregor - -// 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 - -float mul_ints(int x, int y) { return ((float)x) * y; } -struct int_div { - float operator()(int x, int y) const { return ((float)x)/y; }; -}; -int main() -{ - boost::function2 f; - f = int_div(); - std::cout << f(5, 3) << std::endl; - if (f) - std::cout << f(5, 3) << std::endl; -else - std::cout << "f has no target, so it is unsafe to call" << std::endl; - f = 0; - f = &mul_ints; - - return 0; -} diff --git a/test/function_n_test.cpp b/test/function_n_test.cpp deleted file mode 100644 index 9ec1ccd..0000000 --- a/test/function_n_test.cpp +++ /dev/null @@ -1,653 +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 - -#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); - - // 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 = 0; - 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); - function0 v8(one_or_two); - - global_int = 0; - v7(); - BOOST_TEST(global_int == 2); - - global_int = 0; - v8(); - BOOST_TEST(global_int == 2); - - // Test construction from 0 and comparison to 0 - func_void_type v9(0); - BOOST_TEST(v9 == 0); -# if !defined(__SUNPRO_CC) || __SUNPRO_CC > 0x540 || defined(BOOST_STRICT_CONFIG) - BOOST_TEST(0 == v9); -#else - BOOST_TEST(v9.empty()); -#endif - - // 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_ref_cxx98.cpp b/test/function_ref_cxx98.cpp deleted file mode 100644 index ae65c93..0000000 --- a/test/function_ref_cxx98.cpp +++ /dev/null @@ -1,31 +0,0 @@ -// Function library - -// Copyright (C) 2001-2003 Douglas Gregor - -// 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 stateful_type { int operator()(int) const { return 0; } }; - -int main() -{ - stateful_type a_function_object; - boost::function f; - f = boost::ref(a_function_object); - - boost::function f2(f); - - return 0; -} diff --git a/test/function_ref_portable.cpp b/test/function_ref_portable.cpp deleted file mode 100644 index b9d3c9d..0000000 --- a/test/function_ref_portable.cpp +++ /dev/null @@ -1,31 +0,0 @@ -// Function library - -// Copyright (C) 2001-2003 Douglas Gregor - -// 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 stateful_type { int operator()(int) const { return 0; } }; - -int main() -{ - stateful_type a_function_object; - boost::function1 f; - f = boost::ref(a_function_object); - - boost::function1 f2(f); - - return 0; -} diff --git a/test/function_test.cpp b/test/function_test.cpp deleted file mode 100644 index 13db41e..0000000 --- a/test/function_test.cpp +++ /dev/null @@ -1,754 +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 - -#include -#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 != 0); - - // Invocation of a function - global_int = 0; - v1(); - BOOST_TEST(global_int == 5); - - // clear() method - v1.clear(); - BOOST_TEST(v1 == 0); - - // 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 = 0; - BOOST_TEST(0 == v1); - - // Assignment to an empty function from a free function - v1 = BOOST_FUNCTION_TARGET_FIX(&) write_five; - BOOST_TEST(0 != v1); - - // 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 construction from 0 and comparison to 0 - func_void_type v9(0); - BOOST_TEST(v9 == 0); - BOOST_TEST(0 == v9); - - // 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 -} - -static void test_exception() -{ - boost::function f; - try { - f(5, 4); - BOOST_TEST(false); - } - catch(boost::bad_function_call) { - // okay - } -} - -typedef boost::function< void * (void * reader) > reader_type; -typedef std::pair mapped_type; - -static void test_implicit() -{ - mapped_type m; - m = mapped_type(); -} - -static void test_call_obj(boost::function f) -{ - assert(!f.empty()); -} - -static void test_call_cref(const boost::function& f) -{ - assert(!f.empty()); -} - -static void test_call() -{ - test_call_obj(std::plus()); - test_call_cref(std::plus()); -} - -int test_main(int, char* []) -{ - test_zero_args(); - test_one_arg(); - test_two_args(); - test_emptiness(); - test_member_functions(); - test_ref(); - test_allocator(); - test_exception(); - test_implicit(); - test_call(); - - return 0; -} diff --git a/test/function_test_fail1.cpp b/test/function_test_fail1.cpp deleted file mode 100644 index b09caeb..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*[]) -{ - function0 f1; - function0 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 3fd4087..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*[]) -{ - function0 f1; - f1 = bad_fn; - - BOOST_CRITICAL_ERROR("This should not have compiled."); - - return 0; -} diff --git a/test/lambda_test.cpp b/test/lambda_test.cpp deleted file mode 100644 index eb71a68..0000000 --- a/test/lambda_test.cpp +++ /dev/null @@ -1,44 +0,0 @@ -// Boost.Function library - -// Copyright (C) 2002-2003 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 -#include -#include -#include - -using namespace std; -using namespace boost; -using namespace boost::lambda; - -static unsigned -func_impl(int arg1, bool arg2, double arg3) -{ - return abs (static_cast((arg2 ? arg1 : 2 * arg1) * arg3)); -} - -int test_main(int, char*[]) -{ - function f1 = bind(func_impl, 15, _1, _2); - function f2 = bind(f1, false, _1); - function f3 = bind(f2, 4.0); - - f3(); - - return 0; -} - diff --git a/test/mem_fun_cxx98.cpp b/test/mem_fun_cxx98.cpp deleted file mode 100644 index 747c73f..0000000 --- a/test/mem_fun_cxx98.cpp +++ /dev/null @@ -1,35 +0,0 @@ -// Function library - -// Copyright (C) 2001-2003 Douglas Gregor - -// 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 { - int foo(int); -}; -int X::foo(int x) { return -x; } - -int main() -{ - boost::function f; - -f = &X::foo; - -X x; -f(&x, 5); - - return 0; -} diff --git a/test/mem_fun_portable.cpp b/test/mem_fun_portable.cpp deleted file mode 100644 index fcdada5..0000000 --- a/test/mem_fun_portable.cpp +++ /dev/null @@ -1,35 +0,0 @@ -// Function library - -// Copyright (C) 2001-2003 Douglas Gregor - -// 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 { - int foo(int); -}; -int X::foo(int x) { return -x; } - -int main() -{ - boost::function2 f; - -f = &X::foo; - -X x; -f(&x, 5); - - 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 e8dcc1f..0000000 --- a/test/stateless_test.cpp +++ /dev/null @@ -1,48 +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"); - return 0; // suppress warnings - } - - void operator delete(void*, stateless_integer_add*) throw() - { - } -}; - -namespace boost { - template<> - struct is_stateless { - BOOST_STATIC_CONSTANT(bool, value = true); - }; -} - -int test_main(int, char*[]) -{ - boost::function2 f; - f = stateless_integer_add(); - - return 0; -} diff --git a/test/std_bind_cxx98.cpp b/test/std_bind_cxx98.cpp deleted file mode 100644 index a52a15e..0000000 --- a/test/std_bind_cxx98.cpp +++ /dev/null @@ -1,34 +0,0 @@ -// Function library - -// Copyright (C) 2001-2003 Douglas Gregor - -// 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 { - int foo(int); -}; -int X::foo(int x) { return -x; } - -int main() -{ - boost::function f; - X x; - f = std::bind1st( - std::mem_fun(&X::foo), &x); - f(5); // Call x.foo(5) - - return 0; -} diff --git a/test/std_bind_portable.cpp b/test/std_bind_portable.cpp deleted file mode 100644 index bc67934..0000000 --- a/test/std_bind_portable.cpp +++ /dev/null @@ -1,34 +0,0 @@ -// Function library - -// Copyright (C) 2001-2003 Douglas Gregor - -// 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 { - int foo(int); -}; -int X::foo(int x) { return -x; } - -int main() -{ - boost::function1 f; - X x; - f = std::bind1st( - std::mem_fun(&X::foo), &x); - f(5); // Call x.foo(5) - - return 0; -} diff --git a/test/sum_avg_cxx98.cpp b/test/sum_avg_cxx98.cpp deleted file mode 100644 index 164474a..0000000 --- a/test/sum_avg_cxx98.cpp +++ /dev/null @@ -1,32 +0,0 @@ -// Function library - -// Copyright (C) 2001-2003 Douglas Gregor - -// 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() -{ - boost::function sum_avg; - sum_avg = &do_sum_avg; - - return 0; -} diff --git a/test/sum_avg_portable.cpp b/test/sum_avg_portable.cpp deleted file mode 100644 index e31595e..0000000 --- a/test/sum_avg_portable.cpp +++ /dev/null @@ -1,32 +0,0 @@ -// Function library - -// Copyright (C) 2001-2003 Douglas Gregor - -// 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() -{ - boost::function4 sum_avg; - sum_avg = &do_sum_avg; - - return 0; -}