From 955cf95601010e843bee48e4d51dd965f7fbca8e Mon Sep 17 00:00:00 2001 From: nobody Date: Fri, 23 Jul 2004 02:16:28 +0000 Subject: [PATCH] This commit was manufactured by cvs2svn to create branch 'SPIRIT_1_6'. [SVN r23968] --- doc/Jamfile.v2 | 5 - doc/faq.xml | 156 ------ doc/function.xml | 60 -- doc/history.xml | 87 --- doc/misc.xml | 65 --- doc/reference.xml | 929 ------------------------------- doc/tests.xml | 251 --------- doc/tutorial.xml | 357 ------------ example/bind1st.cpp | 32 -- example/int_div.cpp | 26 - example/sum_avg.cpp | 38 -- index.html | 9 - test/Jamfile | 67 --- test/Jamfile.v2 | 61 -- test/allocator_test.cpp | 81 --- test/contains_test.cpp | 174 ------ test/function_30.cpp | 25 - test/function_arith_cxx98.cpp | 34 -- test/function_arith_portable.cpp | 32 -- test/function_n_test.cpp | 648 --------------------- test/function_ref_cxx98.cpp | 27 - test/function_ref_portable.cpp | 27 - test/function_test.cpp | 748 ------------------------- test/function_test_fail1.cpp | 28 - test/function_test_fail2.cpp | 27 - test/lambda_test.cpp | 38 -- test/mem_fun_cxx98.cpp | 31 -- test/mem_fun_portable.cpp | 31 -- test/regression.cfg | 14 - test/stateless_test.cpp | 40 -- test/std_bind_cxx98.cpp | 30 - test/std_bind_portable.cpp | 30 - test/sum_avg_cxx98.cpp | 28 - test/sum_avg_portable.cpp | 28 - 34 files changed, 4264 deletions(-) delete mode 100644 doc/Jamfile.v2 delete mode 100644 doc/faq.xml delete mode 100644 doc/function.xml delete mode 100644 doc/history.xml delete mode 100644 doc/misc.xml delete mode 100644 doc/reference.xml delete mode 100644 doc/tests.xml delete mode 100644 doc/tutorial.xml delete mode 100644 example/bind1st.cpp delete mode 100644 example/int_div.cpp delete mode 100644 example/sum_avg.cpp delete mode 100644 index.html delete mode 100644 test/Jamfile delete mode 100644 test/Jamfile.v2 delete mode 100644 test/allocator_test.cpp delete mode 100644 test/contains_test.cpp delete mode 100644 test/function_30.cpp delete mode 100644 test/function_arith_cxx98.cpp delete mode 100644 test/function_arith_portable.cpp delete mode 100644 test/function_n_test.cpp delete mode 100644 test/function_ref_cxx98.cpp delete mode 100644 test/function_ref_portable.cpp delete mode 100644 test/function_test.cpp delete mode 100644 test/function_test_fail1.cpp delete mode 100644 test/function_test_fail2.cpp delete mode 100644 test/lambda_test.cpp delete mode 100644 test/mem_fun_cxx98.cpp delete mode 100644 test/mem_fun_portable.cpp delete mode 100644 test/regression.cfg delete mode 100644 test/stateless_test.cpp delete mode 100644 test/std_bind_cxx98.cpp delete mode 100644 test/std_bind_portable.cpp delete mode 100644 test/sum_avg_cxx98.cpp delete mode 100644 test/sum_avg_portable.cpp 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 652b9cc..0000000 --- a/doc/faq.xml +++ /dev/null @@ -1,156 +0,0 @@ - - -
- Frequently Asked Questions - - - - Why can't I compare - boost::function objects with - operator== or - operator!=? - - - Comparison between boost::function - objects cannot be implemented "well", and therefore will not be - implemented. The typical semantics requested for f == - g given boost::function objects - f and g are: - - If f and g - store function objects of the same type, use that type's - operator== to compare - them. - - If f and g - store function objects of different types, return - false. - - The problem occurs when the type of the function objects - stored by both f and g doesn't have an - operator==: we would like the expression f == - g to fail to compile, as occurs with, e.g., the standard - containers. However, this is not implementable for - boost::function because it necessarily - "erases" some type information after it has been assigned a - function object, so it cannot try to call - operator== later: it must either find a way to call - operator== now, or it will never be able to call it - later. Note, for instance, what happens if you try to put a - float value into a - boost::function object: you will get an - error at the assignment operator or constructor, not in - operator(), because the function-call expression - must be bound in the constructor or assignment operator. - - The most promising approach is to find a method of - determining if operator== can be called for a - particular type, and then supporting it only when it is - available; in other situations, an exception would be - thrown. However, to date there is no known way to detect if an - arbitrary operator expression f == g is suitably - defined. The best solution known has the following undesirable - qualities: - - - Fails at compile-time for objects where - operator== is not accessible (e.g., because it is - private). - - Fails at compile-time if calling - operator== is ambiguous. - - Appears to be correct if the - operator== declaration is correct, even though - operator== may not compile. - - - All of these problems translate into failures in the - boost::function constructors or - assignment operator, even if the user never invokes - operator==. We can't do that to users. - - The other option is to place the burden on users that want - to use operator==, e.g., by providing an - is_equality_comparable trait they may - specialize. This is a workable solution, but is dangerous in - practice, because forgetting to specialize the trait will result - in unexpected exceptions being thrown from - boost::function's - operator==. This essentially negates the usefulness - of operator== in the context in which it is most - desired: multitarget callbacks. The - Signals library has a way around - this. - - - - - 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. - - - - - How much overhead does a call through boost::function incur? - - The cost of boost::function can be reasonably - consistently measured at around 20ns +/- 10 ns on a modern >2GHz - platform versus directly inlining the code. - - However, the performance of your application may benefit - from or be disadvantaged by boost::function - depending on how your C++ optimiser optimises. Similar to a - standard function pointer, differences of order of 10% have been - noted to the benefit or disadvantage of using - boost::function to call a function that contains a - tight loop depending on your compilation circumstances. - - [Answer provided by Matt Hurd. See ] - - - - -
diff --git a/doc/function.xml b/doc/function.xml deleted file mode 100644 index d6fedc3..0000000 --- a/doc/function.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - Douglas - Gregor - gregod@cs.rpi.edu - - - - 2001 - 2002 - 2003 - Douglas Gregor - - - - Use, modification and distribution is subject to the Boost - Software License, Version 1.0. (See accompanying file - LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) - - - 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 a734fd7..0000000 --- a/doc/reference.xml +++ /dev/null @@ -1,929 +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 - false if this has a target, and true otherwise. - Will not throw. - - - - - - - - Functor* - - - - const Functor* - - - If this stores a target of type - Functor, returns the address of the - target. Otherwise, returns the NULL - pointer. - - Will not throw. - - - - - bool - - const Functor& - - true if this->target<Functor>() is non-NULL and function_equal(*(this->target<Functor>()), f) - - - - - - - - - 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 - false if this has a target, and true 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. - - - - - - - - Functor* - - - - const Functor* - - - If this stores a target of type - Functor, returns the address of the - target. Otherwise, returns the NULL - pointer. - - Will not throw. - - - - - bool - - const Functor& - - true if this->target<Functor>() is non-NULL and function_equal(*(this->target<Functor>()), f) - - - - - - - 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. - - - - - - - - bool - const functionN<T1, T2, ..., TN, Allocator>& - Functor - - - - bool - Functor - const functionN<T1, T2, ..., TN, Allocator>& - - - - bool - const functionN<T1, T2, ..., TN, Allocator>& - reference_wrapper<Functor> - - - - bool - reference_wrapper<Functor> - const functionN<T1, T2, ..., TN, Allocator>& - - - - void - const functionN<T1, T2, ..., TN, Allocator1>& - const functionN<U1, U2, ..., UN, Allocator2>& - - - True when f stores an object of - type Functor and one of the following conditions applies: - - - g is of type - reference_wrapper<Functor> - and f.target<Functor>() == g.get_pointer(). - - g is not of type - reference_wrapper<Functor> - and - function_equal(*(f.target<Functor>()), - g). - - - - - functionN - objects are not - EqualityComparable. - - The safe_bool conversion - opens a loophole whereby two functionN - instances can be compared via ==, although this - is not feasible to implement. The undefined void - operator== closes the loophole and ensures a - compile-time or link-time error. - - - - - - bool - const functionN<T1, T2, ..., TN, Allocator>& - Functor - - - - bool - Functor - const functionN<T1, T2, ..., TN, Allocator>& - - - - bool - const functionN<T1, T2, ..., TN, Allocator>& - reference_wrapper<Functor> - - - - bool - reference_wrapper<Functor> - const functionN<T1, T2, ..., TN, Allocator>& - - - - void - const functionN<T1, T2, ..., TN, Allocator1>& - const functionN<U1, U2, ..., UN, Allocator2>& - - - True when f does not store an - object of type Functor or it stores an object of - type Functor and one of the following conditions - applies: - - - g is of type - reference_wrapper<Functor> - and f.target<Functor>() != g.get_pointer(). - - g is not of type - reference_wrapper<Functor> - and !function_equal(*(f.target<Functor>()), g). - - - - - functionN - objects are not - EqualityComparable. - - The safe_bool conversion - opens a loophole whereby two functionN - instances can be compared via !=, although this - is not feasible to implement. The 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 - false if this has a target, and true 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. - - - - - - - - Functor* - - - - const Functor* - - - If this stores a target of type - Functor, returns the address of the - target. Otherwise, returns the NULL - pointer. - Will not throw. - - - - - bool - - const Functor& - - true if this->target<Functor>() is non-NULL and function_equal(*(this->target<Functor>()), f) - - - - - - - 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. - - - - - - - - bool - const function<Signature, Allocator>& - Functor - - - - bool - Functor - const function<Signature, Allocator>& - - - - bool - const function<Signature, Allocator>& - reference_wrapper<Functor> - - - - bool - reference_wrapper<Functor> - const function<Signature, Allocator>& - - - - void - const function<Signature1, Allocator1>& - const function<Signature2, Allocator2>& - - - True when f stores an object of - type Functor and one of the following conditions applies: - - - g is of type - reference_wrapper<Functor> - and f.target<Functor>() == g.get_pointer(). - - g is not of type - reference_wrapper<Functor> - and function_equals(*(f.target<Functor>()), g). - - - - - function - objects are not - EqualityComparable. - - The safe_bool conversion - opens a loophole whereby two function - instances can be compared via ==, although this - is not feasible to implement. The undefined void - operator== closes the loophole and ensures a - compile-time or link-time error. - - - - - - bool - const function<Signature, Allocator>& - Functor - - - - bool - Functor - const function<Signature, Allocator>& - - - - bool - const function<Signature, Allocator>& - reference_wrapper<Functor> - - - - bool - reference_wrapper<Functor> - const function<Signature, Allocator>& - - - - void - const function<Signature1, Allocator1>& - const function<Signature2, Allocator2>& - - - True when f does not store an - object of type Functor or it stores an object of - type Functor and one of the following conditions - applies: - - - g is of type - reference_wrapper<Functor> - and f.target<Functor>() != g.get_pointer(). - - g is not of type - reference_wrapper<Functor> - and !function_equals(*(f.target<Functor>()), g). - - - - - function - objects are not - EqualityComparable. - - The safe_bool conversion - opens a loophole whereby two function - instances can be compared via !=, although this - is not feasible to implement. The undefined void - operator!= closes the loophole and ensures a - compile-time or link-time error. - - - - -
- -
- - - - bool - - const F& - - - const G& - - Compare two function objects for equality. - f == g. - Only if f == g throws. - - -
- diff --git a/doc/tests.xml b/doc/tests.xml deleted file mode 100644 index 0afa2a8..0000000 --- a/doc/tests.xml +++ /dev/null @@ -1,251 +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. - - - - Test the use of custom allocators. - Allocators are ignored by the implementation. - - - - 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. - - - - 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 operation of the - target member function and the - equality operators. - - - - 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 6f039f1..0000000 --- a/doc/tutorial.xml +++ /dev/null @@ -1,357 +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 - Microsoft Visual C++ 7.1 - - - - - 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 Function Objects 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. - -
- -
- Comparing Boost.Function function objects - - Function object wrappers can be compared via == - or != against any function object that can be stored - within the wrapper. If the function object wrapper contains a - function object of that type, it will be compared against the given - function object (which must be - EqualityComparable). For instance: - - int compute_with_X(X*, int); - -f = &X::foo; -assert(f == &X::foo); -assert(&compute_with_X != f); - - When comparing against an instance of - reference_wrapper, the address - of the object in the - reference_wrapper is compared - against the address of the object stored by the function object - wrapper: - - a_stateful_object so1, so2; -f = boost::ref(so1); -assert(f == boost::ref(so1)); -assert(f == so1); // Only if a_stateful_object is EqualityComparable -assert(f != boost::ref(so2)); - -
- -
- diff --git a/example/bind1st.cpp b/example/bind1st.cpp deleted file mode 100644 index a7d23f4..0000000 --- a/example/bind1st.cpp +++ /dev/null @@ -1,32 +0,0 @@ -// Boost.Function library examples - -// Copyright Doug Gregor 2001-2003. Use, modification and -// distribution is subject to the Boost Software License, Version -// 1.0. (See accompanying file LICENSE_1_0.txt or copy at -// http://www.boost.org/LICENSE_1_0.txt) - -// 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 3812d15..0000000 --- a/example/int_div.cpp +++ /dev/null @@ -1,26 +0,0 @@ -// Boost.Function library examples - -// Copyright Doug Gregor 2001-2003. Use, modification and -// distribution is subject to the Boost Software License, Version -// 1.0. (See accompanying file LICENSE_1_0.txt or copy at -// http://www.boost.org/LICENSE_1_0.txt) - -// 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 8dba3e2..0000000 --- a/example/sum_avg.cpp +++ /dev/null @@ -1,38 +0,0 @@ -// Boost.Function library examples - -// Copyright Doug Gregor 2001-2003. Use, modification and -// distribution is subject to the Boost Software License, Version -// 1.0. (See accompanying file LICENSE_1_0.txt or copy at -// http://www.boost.org/LICENSE_1_0.txt) - -// 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/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 c9e2c5a..0000000 --- a/test/Jamfile +++ /dev/null @@ -1,67 +0,0 @@ -# Function library - -# Copyright (C) 2001-2003 Douglas Gregor - -# Use, modification and distribution is subject to the Boost Software License, -# Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at -# http://www.boost.org/LICENSE_1_0.txt) - -# 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 : : : : ] - - [ run libs/function/test/stateless_test.cpp : : : : ] - - [ run libs/function/test/lambda_test.cpp : : : : ] - - [ 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 : : : : ] - - [ run libs/function/test/contains_test.cpp : : : : ] - ; -} - \ No newline at end of file diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 deleted file mode 100644 index d5cff48..0000000 --- a/test/Jamfile.v2 +++ /dev/null @@ -1,61 +0,0 @@ -# Function library - -# Copyright Doug Gregor 2001-2003. Use, modification and -# distribution is subject to the Boost Software License, Version -# 1.0. (See accompanying file LICENSE_1_0.txt or copy at -# http://www.boost.org/LICENSE_1_0.txt) - -# For more information, see http://www.boost.org/ - -project - : source-location $(BOOST_ROOT) - ; - -# bring in rules for testing -import testing ; - -{ - - 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 : : : : ] - - [ run libs/function/test/contains_test.cpp : : : : ] - - ; -} - \ No newline at end of file diff --git a/test/allocator_test.cpp b/test/allocator_test.cpp deleted file mode 100644 index 12fa448..0000000 --- a/test/allocator_test.cpp +++ /dev/null @@ -1,81 +0,0 @@ -// Boost.Function library - -// Copyright Doug Gregor 2001-2003. Use, modification and -// distribution is subject to the Boost Software License, Version -// 1.0. (See accompanying file LICENSE_1_0.txt or copy at -// http://www.boost.org/LICENSE_1_0.txt) - -// For more information, see http://www.boost.org - -#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/contains_test.cpp b/test/contains_test.cpp deleted file mode 100644 index 0153339..0000000 --- a/test/contains_test.cpp +++ /dev/null @@ -1,174 +0,0 @@ -// Boost.Function library - -// Copyright Doug Gregor 2004. Use, modification and -// distribution is subject to the Boost Software License, Version -// 1.0. (See accompanying file LICENSE_1_0.txt or copy at -// http://www.boost.org/LICENSE_1_0.txt) - -#include -#include -#include - -static int forty_two() { return 42; } - -struct Seventeen -{ - int operator()() const { return 17; } -}; - -struct ReturnInt -{ - explicit ReturnInt(int value) : value(value) {} - - int operator()() const { return value; } - - int value; -}; - -bool operator==(const ReturnInt& x, const ReturnInt& y) -{ return x.value == y.value; } - -bool operator!=(const ReturnInt& x, const ReturnInt& y) -{ return x.value != y.value; } - -static void target_test() -{ - boost::function0 f; - - f = &forty_two; - BOOST_TEST(*f.target() == &forty_two); - BOOST_TEST(!f.target()); - - f = Seventeen(); - BOOST_TEST(!f.target()); - BOOST_TEST(f.target()); - - Seventeen this_seventeen; - f = boost::ref(this_seventeen); - BOOST_TEST(!f.target()); - BOOST_TEST(f.target()); - BOOST_TEST(f.target() == &this_seventeen); -} - -static void equal_test() -{ - boost::function0 f; - - f = &forty_two; - BOOST_TEST(f == &forty_two); - BOOST_TEST(f != ReturnInt(17)); -#if !(defined(__GNUC__) && __GNUC__ == 3 && __GNUC_MINOR__ <= 3) - BOOST_TEST(&forty_two == f); - BOOST_TEST(ReturnInt(17) != f); -#endif - - BOOST_TEST(f.contains(&forty_two)); - - f = ReturnInt(17); - BOOST_TEST(f != &forty_two); - BOOST_TEST(f == ReturnInt(17)); - BOOST_TEST(f != ReturnInt(16)); -#if !(defined(__GNUC__) && __GNUC__ == 3 && __GNUC_MINOR__ <= 3) - BOOST_TEST(&forty_two != f); - BOOST_TEST(ReturnInt(17) == f); - BOOST_TEST(ReturnInt(16) != f); -#endif - - BOOST_TEST(f.contains(ReturnInt(17))); - -#if !defined(BOOST_FUNCTION_NO_FUNCTION_TYPE_SYNTAX) - boost::function g; - - g = &forty_two; - BOOST_TEST(g == &forty_two); - BOOST_TEST(g != ReturnInt(17)); -# if !(defined(__GNUC__) && __GNUC__ == 3 && __GNUC_MINOR__ <= 3) - BOOST_TEST(&forty_two == g); - BOOST_TEST(ReturnInt(17) != g); -# endif - - g = ReturnInt(17); - BOOST_TEST(g != &forty_two); - BOOST_TEST(g == ReturnInt(17)); - BOOST_TEST(g != ReturnInt(16)); -# if !(defined(__GNUC__) && __GNUC__ == 3 && __GNUC_MINOR__ <= 3) - BOOST_TEST(&forty_two != g); - BOOST_TEST(ReturnInt(17) == g); - BOOST_TEST(ReturnInt(16) != g); -# endif -#endif -} - -static void ref_equal_test() -{ - { - ReturnInt ri(17); - boost::function0 f = boost::ref(ri); - - // References and values are equal - BOOST_TEST(f == boost::ref(ri)); - BOOST_TEST(f == ri); - BOOST_TEST(boost::ref(ri) == f); - BOOST_TEST(!(f != boost::ref(ri))); - BOOST_TEST(!(f != ri)); - BOOST_TEST(!(boost::ref(ri) != f)); -#if !(defined(__GNUC__) && __GNUC__ == 3 && __GNUC_MINOR__ <= 3) - BOOST_TEST(ri == f); - BOOST_TEST(!(ri != f)); -#endif - - // Values equal, references inequal - ReturnInt ri2(17); - BOOST_TEST(f == ri2); - BOOST_TEST(f != boost::ref(ri2)); - BOOST_TEST(boost::ref(ri2) != f); - BOOST_TEST(!(f != ri2)); - BOOST_TEST(!(f == boost::ref(ri2))); - BOOST_TEST(!(boost::ref(ri2) == f)); -#if !(defined(__GNUC__) && __GNUC__ == 3 && __GNUC_MINOR__ <= 3) - BOOST_TEST(ri2 == f); - BOOST_TEST(!(ri2 != f)); -#endif - } - -#if !defined(BOOST_FUNCTION_NO_FUNCTION_TYPE_SYNTAX) - { - ReturnInt ri(17); - boost::function f = boost::ref(ri); - - // References and values are equal - BOOST_TEST(f == boost::ref(ri)); - BOOST_TEST(f == ri); - BOOST_TEST(boost::ref(ri) == f); - BOOST_TEST(!(f != boost::ref(ri))); - BOOST_TEST(!(f != ri)); - BOOST_TEST(!(boost::ref(ri) != f)); -# if !(defined(__GNUC__) && __GNUC__ == 3 && __GNUC_MINOR__ <= 3) - BOOST_TEST(ri == f); - BOOST_TEST(!(ri != f)); -# endif - - // Values equal, references inequal - ReturnInt ri2(17); - BOOST_TEST(f == ri2); - BOOST_TEST(f != boost::ref(ri2)); - BOOST_TEST(boost::ref(ri2) != f); - BOOST_TEST(!(f != ri2)); - BOOST_TEST(!(f == boost::ref(ri2))); - BOOST_TEST(!(boost::ref(ri2) == f)); -# if !(defined(__GNUC__) && __GNUC__ == 3 && __GNUC_MINOR__ <= 3) - BOOST_TEST(ri2 == f); - BOOST_TEST(!(ri2 != f)); -# endif - } -#endif -} - -int test_main(int, char*[]) -{ - target_test(); - equal_test(); - ref_equal_test(); - - return 0; -} diff --git a/test/function_30.cpp b/test/function_30.cpp deleted file mode 100644 index b6630c7..0000000 --- a/test/function_30.cpp +++ /dev/null @@ -1,25 +0,0 @@ -// Boost.Function library - -// Copyright Doug Gregor 2002-2003. Use, modification and -// distribution is subject to the Boost Software License, Version -// 1.0. (See accompanying file LICENSE_1_0.txt or copy at -// http://www.boost.org/LICENSE_1_0.txt) - -// 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 4029764..0000000 --- a/test/function_arith_cxx98.cpp +++ /dev/null @@ -1,34 +0,0 @@ -// Function library - -// Copyright (C) 2001-2003 Douglas Gregor - -// Use, modification and distribution is subject to the Boost Software -// License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at -// http://www.boost.org/LICENSE_1_0.txt) - -// 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 24af62c..0000000 --- a/test/function_arith_portable.cpp +++ /dev/null @@ -1,32 +0,0 @@ -// Function library - -// Copyright (C) 2001-2003 Douglas Gregor - -// Use, modification and distribution is subject to the Boost Software -// License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at -// http://www.boost.org/LICENSE_1_0.txt) - -// 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 e993c39..0000000 --- a/test/function_n_test.cpp +++ /dev/null @@ -1,648 +0,0 @@ -// Boost.Function library - -// Copyright Doug Gregor 2001-2003. Use, modification and -// distribution is subject to the Boost Software License, Version -// 1.0. (See accompanying file LICENSE_1_0.txt or copy at -// http://www.boost.org/LICENSE_1_0.txt) - -// 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_five_obj(); // Initialization for Borland C++ 5.5 - write_three_obj three = write_three_obj(); // Ditto - - // 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 - // Initialization for Borland C++ 5.5 - write_const_1_nonconst_2 one_or_two = write_const_1_nonconst_2(); - 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; - // Initialization for Borland C++ 5.5 - generate_five_obj gen_five = generate_five_obj(); - generate_three_obj gen_three = generate_three_obj(); - 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 = negate(); // Initialization for Borland C++ 5.5 - - 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 94f5ec3..0000000 --- a/test/function_ref_cxx98.cpp +++ /dev/null @@ -1,27 +0,0 @@ -// Function library - -// Copyright (C) 2001-2003 Douglas Gregor - -// Use, modification and distribution is subject to the Boost Software -// License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at -// http://www.boost.org/LICENSE_1_0.txt) - -// 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 35beb10..0000000 --- a/test/function_ref_portable.cpp +++ /dev/null @@ -1,27 +0,0 @@ -// Function library - -// Copyright (C) 2001-2003 Douglas Gregor - -// Use, modification and distribution is subject to the Boost Software -// License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at -// http://www.boost.org/LICENSE_1_0.txt) - -// 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 d92b4ae..0000000 --- a/test/function_test.cpp +++ /dev/null @@ -1,748 +0,0 @@ -// Boost.Function library - -// Copyright Doug Gregor 2001-2003. Use, modification and -// distribution is subject to the Boost Software License, Version -// 1.0. (See accompanying file LICENSE_1_0.txt or copy at -// http://www.boost.org/LICENSE_1_0.txt) - -// 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 bd933b3..0000000 --- a/test/function_test_fail1.cpp +++ /dev/null @@ -1,28 +0,0 @@ -// Boost.Function library - -// Copyright Doug Gregor 2001-2003. Use, modification and -// distribution is subject to the Boost Software License, Version -// 1.0. (See accompanying file LICENSE_1_0.txt or copy at -// http://www.boost.org/LICENSE_1_0.txt) - -// For more information, see http://www.boost.org - -#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 0038b31..0000000 --- a/test/function_test_fail2.cpp +++ /dev/null @@ -1,27 +0,0 @@ -// Boost.Function library - -// Copyright Doug Gregor 2001-2003. Use, modification and -// distribution is subject to the Boost Software License, Version -// 1.0. (See accompanying file LICENSE_1_0.txt or copy at -// http://www.boost.org/LICENSE_1_0.txt) - -// For more information, see http://www.boost.org - -#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 89be06c..0000000 --- a/test/lambda_test.cpp +++ /dev/null @@ -1,38 +0,0 @@ -// Boost.Function library - -// Copyright Doug Gregor 2002-2003. Use, modification and -// distribution is subject to the Boost Software License, Version -// 1.0. (See accompanying file LICENSE_1_0.txt or copy at -// http://www.boost.org/LICENSE_1_0.txt) - -// 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 afded46..0000000 --- a/test/mem_fun_cxx98.cpp +++ /dev/null @@ -1,31 +0,0 @@ -// Function library - -// Copyright (C) 2001-2003 Douglas Gregor - -// Use, modification and distribution is subject to the Boost Software -// License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at -// http://www.boost.org/LICENSE_1_0.txt) - -// 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 689eb22..0000000 --- a/test/mem_fun_portable.cpp +++ /dev/null @@ -1,31 +0,0 @@ -// Function library - -// Copyright (C) 2001-2003 Douglas Gregor - -// Use, modification and distribution is subject to the Boost Software -// License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at -// http://www.boost.org/LICENSE_1_0.txt) - -// 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 54859e7..0000000 --- a/test/stateless_test.cpp +++ /dev/null @@ -1,40 +0,0 @@ -// Boost.Function library - -// Copyright Doug Gregor 2001-2003. Use, modification and -// distribution is subject to the Boost Software License, Version -// 1.0. (See accompanying file LICENSE_1_0.txt or copy at -// http://www.boost.org/LICENSE_1_0.txt) - -// For more information, see http://www.boost.org - -#include -#include -#include - -struct stateless_integer_add { - int operator()(int x, int y) const { return x+y; } - - void* operator new(std::size_t, stateless_integer_add*) - { - throw std::runtime_error("Cannot allocate a stateless_integer_add"); - } - - void operator delete(void*, stateless_integer_add*) 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 2d69eb9..0000000 --- a/test/std_bind_cxx98.cpp +++ /dev/null @@ -1,30 +0,0 @@ -// Function library - -// Copyright (C) 2001-2003 Douglas Gregor - -// Use, modification and distribution is subject to the Boost Software -// License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at -// http://www.boost.org/LICENSE_1_0.txt) - -// 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 339ffa8..0000000 --- a/test/std_bind_portable.cpp +++ /dev/null @@ -1,30 +0,0 @@ -// Function library - -// Copyright (C) 2001-2003 Douglas Gregor - -// Use, modification and distribution is subject to the Boost Software -// License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at -// http://www.boost.org/LICENSE_1_0.txt) - -// 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 1bf2dcb..0000000 --- a/test/sum_avg_cxx98.cpp +++ /dev/null @@ -1,28 +0,0 @@ -// Function library - -// Copyright (C) 2001-2003 Douglas Gregor - -// Use, modification and distribution is subject to the Boost Software -// License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at -// http://www.boost.org/LICENSE_1_0.txt) - -// 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 d1687e3..0000000 --- a/test/sum_avg_portable.cpp +++ /dev/null @@ -1,28 +0,0 @@ -// Function library - -// Copyright (C) 2001-2003 Douglas Gregor - -// Use, modification and distribution is subject to the Boost Software -// License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at -// http://www.boost.org/LICENSE_1_0.txt) - -// 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; -}