diff --git a/doc/function.xml b/doc/function.xml
index 210f0e1..d6fedc3 100644
--- a/doc/function.xml
+++ b/doc/function.xml
@@ -19,16 +19,10 @@
- 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.
+ 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
diff --git a/example/bind1st.cpp b/example/bind1st.cpp
index 875481a..ccd8c8b 100644
--- a/example/bind1st.cpp
+++ b/example/bind1st.cpp
@@ -1,15 +1,9 @@
// 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.
+// 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
diff --git a/example/int_div.cpp b/example/int_div.cpp
index b98cc36..0560ab5 100644
--- a/example/int_div.cpp
+++ b/example/int_div.cpp
@@ -1,23 +1,17 @@
// 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.
+// 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; };
+struct int_div {
+ float operator()(int x, int y) const { return ((float)x)/y; };
};
int
diff --git a/example/sum_avg.cpp b/example/sum_avg.cpp
index 413ac75..6bfe2ba 100644
--- a/example/sum_avg.cpp
+++ b/example/sum_avg.cpp
@@ -1,15 +1,9 @@
// 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.
+// 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
@@ -28,7 +22,7 @@ int
main()
{
// The second parameter should be int[], but some compilers (e.g., GCC)
- // complain about this
+ // complain about this
boost::function sum_avg;
sum_avg = &do_sum_avg;
diff --git a/include/boost/function.hpp b/include/boost/function.hpp
index 5d8bca5..9203ff9 100644
--- a/include/boost/function.hpp
+++ b/include/boost/function.hpp
@@ -1,15 +1,9 @@
// Boost.Function library
-// Copyright (C) 2001, 2002 Doug Gregor (gregod@cs.rpi.edu)
-//
-// Permission to copy, use, sell and distribute this software is granted
-// provided this copyright notice appears in all copies.
-// Permission to modify the code and to distribute modified code is granted
-// provided this copyright notice appears in all copies, and a notice
-// that the code was modified is included with the copyright notice.
-//
-// This software is provided "as is" without express or implied warranty,
-// and with no claim as to its suitability for any purpose.
+// 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/libs/function
diff --git a/include/boost/function/detail/function_iterate.hpp b/include/boost/function/detail/function_iterate.hpp
index 4587b94..7e116a6 100644
--- a/include/boost/function/detail/function_iterate.hpp
+++ b/include/boost/function/detail/function_iterate.hpp
@@ -1,15 +1,9 @@
// Boost.Function library
-// Copyright (C) 2002-2003 Doug Gregor (gregod@cs.rpi.edu)
-//
-// Permission to copy, use, sell and distribute this software is granted
-// provided this copyright notice appears in all copies.
-// Permission to modify the code and to distribute modified code is granted
-// provided this copyright notice appears in all copies, and a notice
-// that the code was modified is included with the copyright notice.
-//
-// This software is provided "as is" without express or implied warranty,
-// and with no claim as to its suitability for any purpose.
+// Copyright Doug Gregor 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
#if !defined(BOOST_PP_IS_ITERATING)
diff --git a/include/boost/function/detail/maybe_include.hpp b/include/boost/function/detail/maybe_include.hpp
index 83d82cb..df41437 100644
--- a/include/boost/function/detail/maybe_include.hpp
+++ b/include/boost/function/detail/maybe_include.hpp
@@ -1,15 +1,9 @@
// Boost.Function library
-// Copyright (C) 2003 Doug Gregor (gregod@cs.rpi.edu)
-//
-// Permission to copy, use, sell and distribute this software is granted
-// provided this copyright notice appears in all copies.
-// Permission to modify the code and to distribute modified code is granted
-// provided this copyright notice appears in all copies, and a notice
-// that the code was modified is included with the copyright notice.
-//
-// This software is provided "as is" without express or implied warranty,
-// and with no claim as to its suitability for any purpose.
+// Copyright Doug Gregor 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
diff --git a/include/boost/function/detail/prologue.hpp b/include/boost/function/detail/prologue.hpp
index 524f710..c748f6f 100644
--- a/include/boost/function/detail/prologue.hpp
+++ b/include/boost/function/detail/prologue.hpp
@@ -1,15 +1,9 @@
// Boost.Function library
-// Copyright (C) 2002-2003 Doug Gregor (gregod@cs.rpi.edu)
-//
-// Permission to copy, use, sell and distribute this software is granted
-// provided this copyright notice appears in all copies.
-// Permission to modify the code and to distribute modified code is granted
-// provided this copyright notice appears in all copies, and a notice
-// that the code was modified is included with the copyright notice.
-//
-// This software is provided "as is" without express or implied warranty,
-// and with no claim as to its suitability for any purpose.
+// 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
diff --git a/include/boost/function/function0.hpp b/include/boost/function/function0.hpp
index 133030a..672d19e 100644
--- a/include/boost/function/function0.hpp
+++ b/include/boost/function/function0.hpp
@@ -1,15 +1,9 @@
// Boost.Function library
-// Copyright (C) 2002-2003 Doug Gregor (gregod@cs.rpi.edu)
-//
-// Permission to copy, use, sell and distribute this software is granted
-// provided this copyright notice appears in all copies.
-// Permission to modify the code and to distribute modified code is granted
-// provided this copyright notice appears in all copies, and a notice
-// that the code was modified is included with the copyright notice.
-//
-// This software is provided "as is" without express or implied warranty,
-// and with no claim as to its suitability for any purpose.
+// 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
diff --git a/include/boost/function/function1.hpp b/include/boost/function/function1.hpp
index 6c71d78..a8ba6ca 100644
--- a/include/boost/function/function1.hpp
+++ b/include/boost/function/function1.hpp
@@ -1,15 +1,9 @@
// Boost.Function library
-// Copyright (C) 2002-2003 Doug Gregor (gregod@cs.rpi.edu)
-//
-// Permission to copy, use, sell and distribute this software is granted
-// provided this copyright notice appears in all copies.
-// Permission to modify the code and to distribute modified code is granted
-// provided this copyright notice appears in all copies, and a notice
-// that the code was modified is included with the copyright notice.
-//
-// This software is provided "as is" without express or implied warranty,
-// and with no claim as to its suitability for any purpose.
+// 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
diff --git a/include/boost/function/function10.hpp b/include/boost/function/function10.hpp
index 736d1cd..e8a3712 100644
--- a/include/boost/function/function10.hpp
+++ b/include/boost/function/function10.hpp
@@ -1,15 +1,9 @@
// Boost.Function library
-// Copyright (C) 2002-2003 Doug Gregor (gregod@cs.rpi.edu)
-//
-// Permission to copy, use, sell and distribute this software is granted
-// provided this copyright notice appears in all copies.
-// Permission to modify the code and to distribute modified code is granted
-// provided this copyright notice appears in all copies, and a notice
-// that the code was modified is included with the copyright notice.
-//
-// This software is provided "as is" without express or implied warranty,
-// and with no claim as to its suitability for any purpose.
+// 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
diff --git a/include/boost/function/function2.hpp b/include/boost/function/function2.hpp
index ca07250..cde8711 100644
--- a/include/boost/function/function2.hpp
+++ b/include/boost/function/function2.hpp
@@ -1,15 +1,9 @@
// Boost.Function library
-// Copyright (C) 2002-2003 Doug Gregor (gregod@cs.rpi.edu)
-//
-// Permission to copy, use, sell and distribute this software is granted
-// provided this copyright notice appears in all copies.
-// Permission to modify the code and to distribute modified code is granted
-// provided this copyright notice appears in all copies, and a notice
-// that the code was modified is included with the copyright notice.
-//
-// This software is provided "as is" without express or implied warranty,
-// and with no claim as to its suitability for any purpose.
+// 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
diff --git a/include/boost/function/function3.hpp b/include/boost/function/function3.hpp
index f1047c2..953fb16 100644
--- a/include/boost/function/function3.hpp
+++ b/include/boost/function/function3.hpp
@@ -1,15 +1,9 @@
// Boost.Function library
-// Copyright (C) 2002-2003 Doug Gregor (gregod@cs.rpi.edu)
-//
-// Permission to copy, use, sell and distribute this software is granted
-// provided this copyright notice appears in all copies.
-// Permission to modify the code and to distribute modified code is granted
-// provided this copyright notice appears in all copies, and a notice
-// that the code was modified is included with the copyright notice.
-//
-// This software is provided "as is" without express or implied warranty,
-// and with no claim as to its suitability for any purpose.
+// 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
diff --git a/include/boost/function/function4.hpp b/include/boost/function/function4.hpp
index bf74976..d0376a3 100644
--- a/include/boost/function/function4.hpp
+++ b/include/boost/function/function4.hpp
@@ -1,15 +1,9 @@
// Boost.Function library
-// Copyright (C) 2002-2003 Doug Gregor (gregod@cs.rpi.edu)
-//
-// Permission to copy, use, sell and distribute this software is granted
-// provided this copyright notice appears in all copies.
-// Permission to modify the code and to distribute modified code is granted
-// provided this copyright notice appears in all copies, and a notice
-// that the code was modified is included with the copyright notice.
-//
-// This software is provided "as is" without express or implied warranty,
-// and with no claim as to its suitability for any purpose.
+// 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
diff --git a/include/boost/function/function5.hpp b/include/boost/function/function5.hpp
index 8cbc3b0..1b92c02 100644
--- a/include/boost/function/function5.hpp
+++ b/include/boost/function/function5.hpp
@@ -1,15 +1,9 @@
// Boost.Function library
-// Copyright (C) 2002-2003 Doug Gregor (gregod@cs.rpi.edu)
-//
-// Permission to copy, use, sell and distribute this software is granted
-// provided this copyright notice appears in all copies.
-// Permission to modify the code and to distribute modified code is granted
-// provided this copyright notice appears in all copies, and a notice
-// that the code was modified is included with the copyright notice.
-//
-// This software is provided "as is" without express or implied warranty,
-// and with no claim as to its suitability for any purpose.
+// 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
diff --git a/include/boost/function/function6.hpp b/include/boost/function/function6.hpp
index 541b205..3aab386 100644
--- a/include/boost/function/function6.hpp
+++ b/include/boost/function/function6.hpp
@@ -1,15 +1,9 @@
// Boost.Function library
-// Copyright (C) 2002-2003 Doug Gregor (gregod@cs.rpi.edu)
-//
-// Permission to copy, use, sell and distribute this software is granted
-// provided this copyright notice appears in all copies.
-// Permission to modify the code and to distribute modified code is granted
-// provided this copyright notice appears in all copies, and a notice
-// that the code was modified is included with the copyright notice.
-//
-// This software is provided "as is" without express or implied warranty,
-// and with no claim as to its suitability for any purpose.
+// 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
diff --git a/include/boost/function/function7.hpp b/include/boost/function/function7.hpp
index abd56fb..c314eb5 100644
--- a/include/boost/function/function7.hpp
+++ b/include/boost/function/function7.hpp
@@ -1,15 +1,9 @@
// Boost.Function library
-// Copyright (C) 2002-2003 Doug Gregor (gregod@cs.rpi.edu)
-//
-// Permission to copy, use, sell and distribute this software is granted
-// provided this copyright notice appears in all copies.
-// Permission to modify the code and to distribute modified code is granted
-// provided this copyright notice appears in all copies, and a notice
-// that the code was modified is included with the copyright notice.
-//
-// This software is provided "as is" without express or implied warranty,
-// and with no claim as to its suitability for any purpose.
+// 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
diff --git a/include/boost/function/function8.hpp b/include/boost/function/function8.hpp
index 1bce61a..e6bb6b4 100644
--- a/include/boost/function/function8.hpp
+++ b/include/boost/function/function8.hpp
@@ -1,15 +1,9 @@
// Boost.Function library
-// Copyright (C) 2002-2003 Doug Gregor (gregod@cs.rpi.edu)
-//
-// Permission to copy, use, sell and distribute this software is granted
-// provided this copyright notice appears in all copies.
-// Permission to modify the code and to distribute modified code is granted
-// provided this copyright notice appears in all copies, and a notice
-// that the code was modified is included with the copyright notice.
-//
-// This software is provided "as is" without express or implied warranty,
-// and with no claim as to its suitability for any purpose.
+// 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
diff --git a/include/boost/function/function9.hpp b/include/boost/function/function9.hpp
index 9b87add..6004085 100644
--- a/include/boost/function/function9.hpp
+++ b/include/boost/function/function9.hpp
@@ -1,15 +1,9 @@
// Boost.Function library
-// Copyright (C) 2002-2003 Doug Gregor (gregod@cs.rpi.edu)
-//
-// Permission to copy, use, sell and distribute this software is granted
-// provided this copyright notice appears in all copies.
-// Permission to modify the code and to distribute modified code is granted
-// provided this copyright notice appears in all copies, and a notice
-// that the code was modified is included with the copyright notice.
-//
-// This software is provided "as is" without express or implied warranty,
-// and with no claim as to its suitability for any purpose.
+// 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
diff --git a/include/boost/function/function_base.hpp b/include/boost/function/function_base.hpp
index c36f387..bb2c68d 100644
--- a/include/boost/function/function_base.hpp
+++ b/include/boost/function/function_base.hpp
@@ -1,15 +1,9 @@
// Boost.Function library
-// Copyright (C) 2001-2003 Doug Gregor (gregod@cs.rpi.edu)
-//
-// Permission to copy, use, sell and distribute this software is granted
-// provided this copyright notice appears in all copies.
-// Permission to modify the code and to distribute modified code is granted
-// provided this copyright notice appears in all copies, and a notice
-// that the code was modified is included with the copyright notice.
-//
-// This software is provided "as is" without express or implied warranty,
-// and with no claim as to its suitability for any purpose.
+// 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
diff --git a/include/boost/function/function_template.hpp b/include/boost/function/function_template.hpp
index da30acd..31367b3 100644
--- a/include/boost/function/function_template.hpp
+++ b/include/boost/function/function_template.hpp
@@ -1,15 +1,9 @@
// Boost.Function library
-// Copyright (C) 2001-2003 Doug Gregor (gregod@cs.rpi.edu)
-//
-// Permission to copy, use, sell and distribute this software is granted
-// provided this copyright notice appears in all copies.
-// Permission to modify the code and to distribute modified code is granted
-// provided this copyright notice appears in all copies, and a notice
-// that the code was modified is included with the copyright notice.
-//
-// This software is provided "as is" without express or implied warranty,
-// and with no claim as to its suitability for any purpose.
+// 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
diff --git a/include/boost/function/gen_function_N.pl b/include/boost/function/gen_function_N.pl
index 0b20392..d456b5e 100644
--- a/include/boost/function/gen_function_N.pl
+++ b/include/boost/function/gen_function_N.pl
@@ -2,16 +2,10 @@
#
# Boost.Function library
#
-# Copyright (C) 2001-2003 Doug Gregor (gregod@cs.rpi.edu)
-#
-# Permission to copy, use, sell and distribute this software is granted
-# provided this copyright notice appears in all copies.
-# Permission to modify the code and to distribute modified code is granted
-# provided this copyright notice appears in all copies, and a notice
-# that the code was modified is included with the copyright notice.
-#
-# This software is provided "as is" without express or implied warranty,
-# and with no claim as to its suitability for any purpose.
+# 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
use English;
diff --git a/test/Jamfile b/test/Jamfile
index 7dccc5a..789d77e 100644
--- a/test/Jamfile
+++ b/test/Jamfile
@@ -2,13 +2,9 @@
# Copyright (C) 2001-2003 Douglas Gregor
-# Permission to copy, use, sell and distribute this software is granted
-# provided this copyright notice appears in all copies. Permission to modify
-# the code and to distribute modified code is granted provided this copyright
-# notice appears in all copies, and a notice that the code was modified is
-# included with the copyright notice. This software is provided "as is"
-# without express or implied warranty, and with no claim as to its suitability
-# for any purpose.
+# 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/
@@ -17,7 +13,8 @@
subproject libs/function/test ;
# bring in rules for testing
-import testing ;
+SEARCH on testing.jam = $(BOOST_BUILD_PATH) ;
+include testing.jam ;
# Make tests run by default.
DEPENDS all : test ;
diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
index 9335276..89950ac 100644
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -1,14 +1,9 @@
# Function library
-# Copyright (C) 2001-2003 Douglas Gregor
-
-# Permission to copy, use, sell and distribute this software is granted
-# provided this copyright notice appears in all copies. Permission to modify
-# the code and to distribute modified code is granted provided this copyright
-# notice appears in all copies, and a notice that the code was modified is
-# included with the copyright notice. This software is provided "as is"
-# without express or implied warranty, and with no claim as to its suitability
-# for any purpose.
+# 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/
diff --git a/test/allocator_test.cpp b/test/allocator_test.cpp
index 1809db1..97a86a1 100644
--- a/test/allocator_test.cpp
+++ b/test/allocator_test.cpp
@@ -1,15 +1,9 @@
// 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.
+// 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
@@ -34,7 +28,7 @@ struct counting_allocator : public std::allocator
typedef counting_allocator other;
};
-
+
T* allocate(std::size_t n)
{
alloc_count++;
@@ -60,7 +54,7 @@ static void do_nothing() {}
int
test_main(int, char*[])
{
- function2 > f;
+ function2 > f;
f = plus();
f.clear();
BOOST_TEST(alloc_count == 1);
@@ -78,7 +72,7 @@ test_main(int, char*[])
fv.clear();
BOOST_TEST(alloc_count == 1);
BOOST_TEST(dealloc_count == 1);
-
+
alloc_count = 0;
dealloc_count = 0;
fv = &do_nothing;
diff --git a/test/function_30.cpp b/test/function_30.cpp
index 1fd96ed..b6630c7 100644
--- a/test/function_30.cpp
+++ b/test/function_30.cpp
@@ -1,15 +1,9 @@
// Boost.Function library
-// Copyright (C) 2002-2003 Doug Gregor (gregod@cs.rpi.edu)
-//
-// Permission to copy, use, sell and distribute this software is granted
-// provided this copyright notice appears in all copies.
-// Permission to modify the code and to distribute modified code is granted
-// provided this copyright notice appears in all copies, and a notice
-// that the code was modified is included with the copyright notice.
-//
-// This software is provided "as is" without express or implied warranty,
-// and with no claim as to its suitability for any purpose.
+// 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
diff --git a/test/function_arith_cxx98.cpp b/test/function_arith_cxx98.cpp
index 8903f72..4029764 100644
--- a/test/function_arith_cxx98.cpp
+++ b/test/function_arith_cxx98.cpp
@@ -2,13 +2,9 @@
// Copyright (C) 2001-2003 Douglas Gregor
-// Permission to copy, use, sell and distribute this software is granted
-// provided this copyright notice appears in all copies. Permission to modify
-// the code and to distribute modified code is granted provided this copyright
-// notice appears in all copies, and a notice that the code was modified is
-// included with the copyright notice. This software is provided "as is"
-// without express or implied warranty, and with no claim as to its
-// suitability for any purpose.
+// 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/
diff --git a/test/function_arith_portable.cpp b/test/function_arith_portable.cpp
index 3bbc112..24af62c 100644
--- a/test/function_arith_portable.cpp
+++ b/test/function_arith_portable.cpp
@@ -2,13 +2,9 @@
// Copyright (C) 2001-2003 Douglas Gregor
-// Permission to copy, use, sell and distribute this software is granted
-// provided this copyright notice appears in all copies. Permission to modify
-// the code and to distribute modified code is granted provided this copyright
-// notice appears in all copies, and a notice that the code was modified is
-// included with the copyright notice. This software is provided "as is"
-// without express or implied warranty, and with no claim as to its
-// suitability for any purpose.
+// 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/
diff --git a/test/function_n_test.cpp b/test/function_n_test.cpp
index 9ec1ccd..eb22776 100644
--- a/test/function_n_test.cpp
+++ b/test/function_n_test.cpp
@@ -1,15 +1,9 @@
// Boost.Function library
-// Copyright (C) 2001, 2002 Doug Gregor (gregod@cs.rpi.edu)
-//
-// Permission to copy, use, sell and distribute this software is granted
-// provided this copyright notice appears in all copies.
-// Permission to modify the code and to distribute modified code is granted
-// provided this copyright notice appears in all copies, and a notice
-// that the code was modified is included with the copyright notice.
-//
-// This software is provided "as is" without express or implied warranty,
-// and with no claim as to its suitability for any purpose.
+// 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
diff --git a/test/function_ref_cxx98.cpp b/test/function_ref_cxx98.cpp
index ae65c93..94f5ec3 100644
--- a/test/function_ref_cxx98.cpp
+++ b/test/function_ref_cxx98.cpp
@@ -2,13 +2,9 @@
// Copyright (C) 2001-2003 Douglas Gregor
-// Permission to copy, use, sell and distribute this software is granted
-// provided this copyright notice appears in all copies. Permission to modify
-// the code and to distribute modified code is granted provided this copyright
-// notice appears in all copies, and a notice that the code was modified is
-// included with the copyright notice. This software is provided "as is"
-// without express or implied warranty, and with no claim as to its
-// suitability for any purpose.
+// 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/
diff --git a/test/function_ref_portable.cpp b/test/function_ref_portable.cpp
index b9d3c9d..35beb10 100644
--- a/test/function_ref_portable.cpp
+++ b/test/function_ref_portable.cpp
@@ -2,13 +2,9 @@
// Copyright (C) 2001-2003 Douglas Gregor
-// Permission to copy, use, sell and distribute this software is granted
-// provided this copyright notice appears in all copies. Permission to modify
-// the code and to distribute modified code is granted provided this copyright
-// notice appears in all copies, and a notice that the code was modified is
-// included with the copyright notice. This software is provided "as is"
-// without express or implied warranty, and with no claim as to its
-// suitability for any purpose.
+// 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/
diff --git a/test/function_test.cpp b/test/function_test.cpp
index 13db41e..d92b4ae 100644
--- a/test/function_test.cpp
+++ b/test/function_test.cpp
@@ -1,15 +1,9 @@
// Boost.Function library
-// Copyright (C) 2001, 2002 Doug Gregor (gregod@cs.rpi.edu)
-//
-// Permission to copy, use, sell and distribute this software is granted
-// provided this copyright notice appears in all copies.
-// Permission to modify the code and to distribute modified code is granted
-// provided this copyright notice appears in all copies, and a notice
-// that the code was modified is included with the copyright notice.
-//
-// This software is provided "as is" without express or implied warranty,
-// and with no claim as to its suitability for any purpose.
+// 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
diff --git a/test/function_test_fail1.cpp b/test/function_test_fail1.cpp
index b09caeb..247adc2 100644
--- a/test/function_test_fail1.cpp
+++ b/test/function_test_fail1.cpp
@@ -1,15 +1,9 @@
// 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.
+// 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
diff --git a/test/function_test_fail2.cpp b/test/function_test_fail2.cpp
index 3fd4087..9a79465 100644
--- a/test/function_test_fail2.cpp
+++ b/test/function_test_fail2.cpp
@@ -1,15 +1,9 @@
// 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.
+// 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
diff --git a/test/lambda_test.cpp b/test/lambda_test.cpp
index eb71a68..87da7d7 100644
--- a/test/lambda_test.cpp
+++ b/test/lambda_test.cpp
@@ -1,15 +1,9 @@
// Boost.Function library
-// Copyright (C) 2002-2003 Doug Gregor (gregod@cs.rpi.edu)
-//
-// Permission to copy, use, sell and distribute this software is granted
-// provided this copyright notice appears in all copies.
-// Permission to modify the code and to distribute modified code is granted
-// provided this copyright notice appears in all copies, and a notice
-// that the code was modified is included with the copyright notice.
-//
-// This software is provided "as is" without express or implied warranty,
-// and with no claim as to its suitability for any purpose.
+// 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
diff --git a/test/mem_fun_cxx98.cpp b/test/mem_fun_cxx98.cpp
index 747c73f..afded46 100644
--- a/test/mem_fun_cxx98.cpp
+++ b/test/mem_fun_cxx98.cpp
@@ -2,13 +2,9 @@
// Copyright (C) 2001-2003 Douglas Gregor
-// Permission to copy, use, sell and distribute this software is granted
-// provided this copyright notice appears in all copies. Permission to modify
-// the code and to distribute modified code is granted provided this copyright
-// notice appears in all copies, and a notice that the code was modified is
-// included with the copyright notice. This software is provided "as is"
-// without express or implied warranty, and with no claim as to its
-// suitability for any purpose.
+// 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/
diff --git a/test/mem_fun_portable.cpp b/test/mem_fun_portable.cpp
index fcdada5..689eb22 100644
--- a/test/mem_fun_portable.cpp
+++ b/test/mem_fun_portable.cpp
@@ -2,13 +2,9 @@
// Copyright (C) 2001-2003 Douglas Gregor
-// Permission to copy, use, sell and distribute this software is granted
-// provided this copyright notice appears in all copies. Permission to modify
-// the code and to distribute modified code is granted provided this copyright
-// notice appears in all copies, and a notice that the code was modified is
-// included with the copyright notice. This software is provided "as is"
-// without express or implied warranty, and with no claim as to its
-// suitability for any purpose.
+// 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/
diff --git a/test/stateless_test.cpp b/test/stateless_test.cpp
index 55a7f9c..1eae073 100644
--- a/test/stateless_test.cpp
+++ b/test/stateless_test.cpp
@@ -1,15 +1,9 @@
// 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.
+// 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
diff --git a/test/std_bind_cxx98.cpp b/test/std_bind_cxx98.cpp
index a52a15e..2d69eb9 100644
--- a/test/std_bind_cxx98.cpp
+++ b/test/std_bind_cxx98.cpp
@@ -2,13 +2,9 @@
// Copyright (C) 2001-2003 Douglas Gregor
-// Permission to copy, use, sell and distribute this software is granted
-// provided this copyright notice appears in all copies. Permission to modify
-// the code and to distribute modified code is granted provided this copyright
-// notice appears in all copies, and a notice that the code was modified is
-// included with the copyright notice. This software is provided "as is"
-// without express or implied warranty, and with no claim as to its
-// suitability for any purpose.
+// 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/
diff --git a/test/std_bind_portable.cpp b/test/std_bind_portable.cpp
index bc67934..339ffa8 100644
--- a/test/std_bind_portable.cpp
+++ b/test/std_bind_portable.cpp
@@ -2,13 +2,9 @@
// Copyright (C) 2001-2003 Douglas Gregor
-// Permission to copy, use, sell and distribute this software is granted
-// provided this copyright notice appears in all copies. Permission to modify
-// the code and to distribute modified code is granted provided this copyright
-// notice appears in all copies, and a notice that the code was modified is
-// included with the copyright notice. This software is provided "as is"
-// without express or implied warranty, and with no claim as to its
-// suitability for any purpose.
+// 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/
diff --git a/test/sum_avg_cxx98.cpp b/test/sum_avg_cxx98.cpp
index 164474a..1bf2dcb 100644
--- a/test/sum_avg_cxx98.cpp
+++ b/test/sum_avg_cxx98.cpp
@@ -2,13 +2,9 @@
// Copyright (C) 2001-2003 Douglas Gregor
-// Permission to copy, use, sell and distribute this software is granted
-// provided this copyright notice appears in all copies. Permission to modify
-// the code and to distribute modified code is granted provided this copyright
-// notice appears in all copies, and a notice that the code was modified is
-// included with the copyright notice. This software is provided "as is"
-// without express or implied warranty, and with no claim as to its
-// suitability for any purpose.
+// 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/
diff --git a/test/sum_avg_portable.cpp b/test/sum_avg_portable.cpp
index fe73be8..bc30ded 100644
--- a/test/sum_avg_portable.cpp
+++ b/test/sum_avg_portable.cpp
@@ -2,13 +2,9 @@
// Copyright (C) 2001-2003 Douglas Gregor
-// Permission to copy, use, sell and distribute this software is granted
-// provided this copyright notice appears in all copies. Permission to modify
-// the code and to distribute modified code is granted provided this copyright
-// notice appears in all copies, and a notice that the code was modified is
-// included with the copyright notice. This software is provided "as is"
-// without express or implied warranty, and with no claim as to its
-// suitability for any purpose.
+// 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/