diff --git a/doc/faq.html b/doc/faq.html deleted file mode 100644 index 5b1e07e..0000000 --- a/doc/faq.html +++ /dev/null @@ -1,44 +0,0 @@ - - - - Boost.Function Frequently Asked Questions - - - -

boost::function Frequently Asked Questions

- -

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

-

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

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

-

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

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

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

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

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

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

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

Q: Why (function) cloning?

-

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


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

Boost.Function Reference Manual

- -

Header <boost/function.hpp> synopsis

-

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

-namespace boost {
-  class function_base
-  {
-    typedef implementation-defined safe_bool;
-    bool empty() const;
-    operator safe_bool() const;
-    safe_bool operator!() const;
-  };
-
-  // For N in [0, MAX_ARGS]
-  template<typename ResultType,
-           typename Arg1,
-	   typename Arg2,
-           ...
-           typename ArgN,
-	   typename Policy    = empty_function_policy,
-	   typename Mixin     = empty_function_mixin,
-	   typename Allocator = std::allocator<function_base> >
-  class functionN : public function_base, public Mixin
-  {
-    typedef ResultType result_type; // [1]
-    typedef Policy     policy_type;
-    typedef Mixin      mixin_type;
-    typedef Allocator  allocator_type;
-
-    typedef Arg1 argument_type;        // If N == 1
-
-    typedef Arg1 first_argument_type;  // If N == 2
-    typedef Arg2 second_argument_type; // If N == 2
-
-    // Construction
-    explicit functionN(const Mixin& = Mixin());
-    functionN(const functionN&);
-    template<typename F> functionN(F, const Mixin& = Mixin());
-    template<typename F> functionN(reference_wrapper<F>);
-    
-    // Assignment
-    functionN& operator=(const functionN&);
-    template<typename F> functionN& operator=(F);
-    template<typename F> functionN& operator=(reference_wrapper<F>);
-    void set(const functionN&);
-    template<typename F> void set(F);
-    void swap(functionN&);
-    void clear();
-
-    // Invocation
-    result_type operator()(Arg1 a1, Arg2 a2, ..., ArgN aN) const;
-  };
-
-  template<typename ResultType,
-           typename Arg1,
-	   typename Arg2,
-           ...
-	   typename ArgN,
-           typename Policy,
-           typename Mixin,
-           typename Allocator>
-  void swap(functionN<ResultType, Arg1, Arg2, ..., ArgN, Policy, Mixin, Allocator>&,
-            functionN<ResultType, Arg1, Arg2, ..., ArgN, Policy, Mixin, Allocator>&);
-
-  // For any N in [0, MAX_ARGS]
-  template<typename ResultType,
-           typename Arg1,
-	   typename Arg2,
-           ...
-           typename ArgN,
-           typename ArgN+1 = implementation-defined,
-           typename ArgN+2 = implementation-defined,
-	   ...
-	   typename ArgMAX_ARGS = implementation-defined>
-  class function : public functionN<ResultType, Arg1, Arg2, ..., ArgN>
-  {
-    // Construction
-    function();
-    function(const function&);
-    function(const functionN<ResultType, Arg1, Arg2, ..., ArgN>&);
-    template<typename F> functionN(F);
-    
-    // Assignment
-    function& operator=(const function&);
-    function& operator=(const functionN<ResultType, Arg1, Arg2, ..., ArgN>&);
-    template<typename F> function& operator=(F);
-    void set(const function&);
-    void set(const functionN<ResultType, Arg1, Arg2, ..., ArgN>&);
-    template<typename F> void set(F);
-  };
-
-  template<typename ResultType,
-           typename Arg1,
-	   typename Arg2,
-           ...
-	   typename ArgMAX_ARGS>
-  void swap(function<ResultType, Arg1, Arg2, ..., ArgMAX_ARGS>&,
-            function<ResultType, Arg1, Arg2, ..., ArgMAX_ARGS>&);
-}	   
-
- -

Definitions

-

-

- -

Class function_base

-

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

bool empty() const -

- -

operator safe_bool() const -

- -

safe_bool operator!() const -

- -

Class template functionN

-

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

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

- -

functionN(const functionN& g); -

- -

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

- -

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

- -

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

- -

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

- -

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

- -

void set(const functionN& g); -

- -

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

- -

void swap(functionN& g); -

- -

void clear(); -

- -

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

- -

Class template function

-

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

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

Operations

-

-

-template<typename ResultType,
-         typename Arg1,
-	 typename Arg2,
-         ...
-	 typename ArgN,
-         typename Policy,
-         typename Mixin,
-         typename Allocator>
-void swap(functionN<ResultType, Arg1, Arg2, ..., ArgN, Policy, Mixin, Allocator>& f,
-          functionN<ResultType, Arg1, Arg2, ..., ArgN, Policy, Mixin, Allocator>& g);
-
- - -

-

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

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


-
Douglas Gregor
- - -Last modified: Thu Jan 31 21:55:35 EST 2002 - - - diff --git a/doc/tutorial.html b/doc/tutorial.html deleted file mode 100644 index 756de92..0000000 --- a/doc/tutorial.html +++ /dev/null @@ -1,205 +0,0 @@ - - - - Boost.Function Tutorial - - - - -

Boost.Function Tutorial

- -

Basic usage

-

A function wrapper is defined simply by instantiating the function class template with the desired return type and argument types. 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: -

-boost::function<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: -

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

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

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

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

Free functions

-

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

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

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

Member functions

- -

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

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

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

- -

References to Functions

-

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

-  stateful_type a_function_object;
-  boost::function<int, int> f;
-  f = ref(a_function_object);
-
-  boost::function<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. - -

The function family

-

The header <boost/function.hpp> defines the primary entry point to the function object wrappers, the class template boost::function. This class template is essentially a thin wrapper around a set of similar numbered function object wrappers, boost::function0, boost::function1, etc., where the number indicates the number of arguments passed to the function object target. The declaration of f above could also be written as: -

-boost::function2<float, int, int> f;
-
- -

The numbered class templates contain most of the implementation and are each distinct class templates. They may be helpful if used in shared libraries, where the number of arguments supported by Boost.Function may change between revisions. Additionally, some compilers (e.g., Microsoft Visual C++ 6.0) have been known to be incapable of compiling boost::function in some instances but are able to handle the numbered variants. - -

Advanced usage

-

The boost::function family supports additional customization by means of policies, mixins, and allocators. The specific usage of each of these will be explained in later sections, but they share a common problem: how to replace each default with your own version. - -

With boost::function it is not so clear, because support for an arbitrary number of parameters means that it is impossible to specify just the last parameter, but not 5 of the parameters in between. Therefore, boost::function doubles as a generative interface for the underlying numbered class templates that uses named template parameters. For instance, to specify both a policy and an allocator for a function object wrapper f taking an int and returning an int, use: -

-  function<int, int>::policy<MyPolicy>::allocator<MyAllocator>::type f;
-
- -

The named template parameters policy, mixin and allocator each take one template parameter (the replacement class) and may be nested as above to generate a function object wrapper. The ::type at the end accesses the actual type that fits the given properties. - -

Policies

-

Policies define what happens directly before and directly after an invocation of a function object target is made. A policy must have two member functions, precall and postcall, each of which must be able to accept a const function object wrapper pointer. The following policy will print "before" prior to execution and "after" afterwards: - -

-struct print_policy {
-  void precall(const boost::function_base*) { std::cout << "before"; }
-  void postcall(const boost::function_base*) { std::cout << "after"; }
-};
-
- -

A new instance of the policy class will be created prior to calling the function object target and will be preserved until after the call has returned. Therefore, for any invocation the precall and postcall will be executed on the same policy class instance; however, policy class instances will not be kept between target invocations. - -

Policies are further described in the Boost discussion on generic programming techniques. - -

Mixins

-

The function object wrappers allow any class to be "mixed in" as a base class. This allows extra members and/or functionality to be included by the user. This can be used, for instance, to overcome the limitations of policies by storing data between invocations in a base class instead of in a static member of a policy class. - -

Allocators

-

The function object wrappers allow the user to specify a new allocator to handle the cloning of function object targets (when the wrappers are copied). The allocators used are the same as the C++ standard library allocators. The wrappers assume the allocators are stateless, and will create a new instance each time they are used (because they are rebound very often). This shares the semantics of most standard library implementations, and is explicitly allowed by the C++ standard. - -

Example: Synchronized callbacks

-

Synchronization of callbacks in a multithreaded environment is extremely important. Using mixins and policies, a Boost.Function object may implement its own synchronization policy that ensures that only one thread can be in the callback function at any given point in time. - -

We will use the prototype Boost.Threads library for its recursive_mutex. Since the mutex is on a per-callback basis, we will add a mutex to the boost::function by mixin it in with this mixin class: -

-class SynchronizedMixin {
-  mutable boost::recursive_mutex mutex;
-};
-
- -

Next, we create a policy that obtains a lock before the target is called (via the precall function) and releases the lock after the target has been called (via the postcall function): - -

-class SynchronizedPolicy {
-  std::auto_ptr<boost::recursive_mutex::lock> lock;
-
-  void precall(const SynchronizedMixin* f) 
-  {
-    lock.reset(new boost::recursive_mutex::lock(f->mutex));
-  }
-
-  void postcall(const SynchronizedMixin* f)
-  {
-    lock.reset();
-  }
-};
-
- -

The use of std::auto_ptr ensures that the lock will be destroyed (and therefore released) if an exception is thrown by the target function. Now we can use the policy and mixin together to create a synchronized callback: - -

-boost::function2<float, int, int, SynchronizedPolicy, SynchronizedMixin> f;
-
- -
-
Douglas Gregor
- - -Last modified: Fri Dec 14 19:58:14 EST 2001 - - - 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/index.html b/index.html deleted file mode 100644 index d807ad7..0000000 --- a/index.html +++ /dev/null @@ -1,89 +0,0 @@ - - - - Boost.Function - - - - -

Header <boost/function.hpp>

- -

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

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

- -

Boost.Function vs. Function Pointers

-

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

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

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

Performance

-

Function object wrapper size

-

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

Copying efficiency

-

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

Invocation efficiency

-

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

Portability

-

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

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

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

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

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

Design rationale

-

Combatting virtual function bloat

-

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

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

Acknowledgements

-

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


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