|
|
Boost-Commit : |
From: eric_at_[hidden]
Date: 2008-05-12 02:59:07
Author: eric_niebler
Date: 2008-05-12 02:59:01 EDT (Mon, 12 May 2008)
New Revision: 45291
URL: http://svn.boost.org/trac/boost/changeset/45291
Log:
misc clean-up
Text files modified:
branches/proto/v4/boost/phoenix/core.hpp | 2
branches/proto/v4/boost/phoenix/core/actor.hpp | 64 +++++++++++++++++++--------------------
branches/proto/v4/boost/phoenix/core/argument.hpp | 22 ++++++-------
branches/proto/v4/boost/phoenix/core/limits.hpp | 4 +-
branches/proto/v4/boost/phoenix/core/reference.hpp | 24 ++++----------
branches/proto/v4/boost/phoenix/core/value.hpp | 33 ++++++++------------
branches/proto/v4/boost/phoenix/operator.hpp | 2
branches/proto/v4/boost/phoenix/operator/if_else.hpp | 2
branches/proto/v4/boost/phoenix/operator/io.hpp | 2
branches/proto/v4/boost/phoenix/statement.hpp | 2
branches/proto/v4/boost/phoenix/statement/if.hpp | 33 ++++----------------
branches/proto/v4/boost/phoenix/version.hpp | 2
branches/proto/v4/libs/phoenix/test/algorithm/iteration.cpp | 2
branches/proto/v4/libs/phoenix/test/algorithm/querying.cpp | 22 ++++++------
branches/proto/v4/libs/phoenix/test/algorithm/querying2.cpp | 2
branches/proto/v4/libs/phoenix/test/algorithm/transformation1.cpp | 12 +++---
branches/proto/v4/libs/phoenix/test/algorithm/transformation2.cpp | 10 +++---
branches/proto/v4/libs/phoenix/test/algorithm/transformation3.cpp | 10 +++---
branches/proto/v4/libs/phoenix/test/algorithm/transformation4.cpp | 2
branches/proto/v4/libs/phoenix/test/bind/bind_function_object_tests.cpp | 2
branches/proto/v4/libs/phoenix/test/bind/bind_function_tests.cpp | 2
branches/proto/v4/libs/phoenix/test/bind/bind_member_function_tests.cpp | 2
branches/proto/v4/libs/phoenix/test/bind/bind_member_variable_tests.cpp | 2
branches/proto/v4/libs/phoenix/test/container/container_tests.hpp | 2
branches/proto/v4/libs/phoenix/test/container/container_tests1a.cpp | 4 +-
branches/proto/v4/libs/phoenix/test/container/container_tests1b.cpp | 4 +-
branches/proto/v4/libs/phoenix/test/container/container_tests2a.cpp | 2
branches/proto/v4/libs/phoenix/test/container/container_tests2b.cpp | 2
branches/proto/v4/libs/phoenix/test/container/container_tests3a.cpp | 2
branches/proto/v4/libs/phoenix/test/container/container_tests3b.cpp | 2
branches/proto/v4/libs/phoenix/test/container/container_tests4a.cpp | 2
branches/proto/v4/libs/phoenix/test/container/container_tests4b.cpp | 2
branches/proto/v4/libs/phoenix/test/container/container_tests5a.cpp | 2
branches/proto/v4/libs/phoenix/test/container/container_tests5b.cpp | 2
branches/proto/v4/libs/phoenix/test/container/container_tests6a.cpp | 2
branches/proto/v4/libs/phoenix/test/container/container_tests6b.cpp | 2
branches/proto/v4/libs/phoenix/test/core/compose_tests.cpp | 2
branches/proto/v4/libs/phoenix/test/core/primitives_tests.cpp | 4 +-
branches/proto/v4/libs/phoenix/test/function/function_tests.cpp | 2
branches/proto/v4/libs/phoenix/test/object/cast_tests.cpp | 2
branches/proto/v4/libs/phoenix/test/object/new_delete_tests.cpp | 2
branches/proto/v4/libs/phoenix/test/operator/bitwise_tests.cpp | 2
branches/proto/v4/libs/phoenix/test/operator/if_else_tests.cpp | 2
branches/proto/v4/libs/phoenix/test/operator/io_tests.cpp | 2
branches/proto/v4/libs/phoenix/test/operator/logical_tests.cpp | 2
branches/proto/v4/libs/phoenix/test/operator/member.cpp | 2
branches/proto/v4/libs/phoenix/test/operator/misc_binary_tests.cpp | 2
branches/proto/v4/libs/phoenix/test/operator/self_tests.cpp | 2
branches/proto/v4/libs/phoenix/test/operator/unary_tests.cpp | 2
branches/proto/v4/libs/phoenix/test/scope/bug_000008.cpp | 2
branches/proto/v4/libs/phoenix/test/scope/dynamic_tests.cpp | 4 +-
branches/proto/v4/libs/phoenix/test/scope/lambda_tests.cpp | 12 +++---
branches/proto/v4/libs/phoenix/test/scope/let_tests.cpp | 28 ++++++++--------
branches/proto/v4/libs/phoenix/test/statement/exceptions.cpp | 2
branches/proto/v4/libs/phoenix/test/statement/if_tests.cpp | 2
branches/proto/v4/libs/phoenix/test/statement/loops_tests.cpp | 2
branches/proto/v4/libs/phoenix/test/statement/switch_tests.cpp | 2
57 files changed, 166 insertions(+), 206 deletions(-)
Modified: branches/proto/v4/boost/phoenix/core.hpp
==============================================================================
--- branches/proto/v4/boost/phoenix/core.hpp (original)
+++ branches/proto/v4/boost/phoenix/core.hpp 2008-05-12 02:59:01 EDT (Mon, 12 May 2008)
@@ -1,7 +1,7 @@
/*=============================================================================
Copyright (c) 2001-2007 Joel de Guzman
- Distributed under the Boost Software License, Version 1.0. (See accompanying
+ Distributed under 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)
==============================================================================*/
#ifndef PHOENIX_CORE_HPP
Modified: branches/proto/v4/boost/phoenix/core/actor.hpp
==============================================================================
--- branches/proto/v4/boost/phoenix/core/actor.hpp (original)
+++ branches/proto/v4/boost/phoenix/core/actor.hpp 2008-05-12 02:59:01 EDT (Mon, 12 May 2008)
@@ -2,7 +2,7 @@
/*=============================================================================
Copyright (c) 2001-2007 Joel de Guzman
- Distributed under the Boost Software License, Version 1.0. (See accompanying
+ Distributed under 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)
==============================================================================*/
#ifndef BOOST_PHOENIX_ACTOR_HPP_EAN_2008_05_09
@@ -43,18 +43,6 @@
////////////////////////////////////////////////////////////////////////////////////////////
template<typename Value, typename Void = void>
- struct is_terminal_extended
- : mpl::true_
- {};
-
- ////////////////////////////////////////////////////////////////////////////////////////////
- template<typename Value>
- struct is_terminal_extended<Value, typename terminal_extension<Value>::phoenix_terminal_extension_not_specialized_>
- : mpl::false_
- {};
-
- ////////////////////////////////////////////////////////////////////////////////////////////
- template<typename Value, typename Void = void>
struct is_terminal_nullary
: mpl::true_
{};
@@ -65,7 +53,7 @@
template<typename Expr>
struct actor;
}
-
+
using actorns_::actor;
namespace detail
@@ -73,11 +61,26 @@
////////////////////////////////////////////////////////////////////////////////////////
struct evaluator;
}
-
+
using detail::evaluator;
namespace detail
{
+ ////////////////////////////////////////////////////////////////////////////////////////////
+ template<typename Value, typename Void = void>
+ struct has_terminal_extension
+ : mpl::true_
+ {};
+
+ ////////////////////////////////////////////////////////////////////////////////////////////
+ template<typename Value>
+ struct has_terminal_extension<
+ Value
+ , typename terminal_extension<Value>::phoenix_terminal_extension_not_specialized_
+ >
+ : mpl::false_
+ {};
+
////////////////////////////////////////////////////////////////////////////////////////
// True when a lambda expression can be applied with no arguments and
// without an active exception object
@@ -127,7 +130,7 @@
>::type
type;
};
-
+
template<typename T, std::size_t N>
struct storage<T[N]>
{
@@ -140,7 +143,7 @@
{
template<typename Sig>
struct result;
-
+
template<typename This, typename Expr>
struct result<This(Expr)>
{
@@ -152,16 +155,14 @@
{
typedef
actor<
- proto::expr<
- proto::tag::terminal
- , proto::term<typename storage<T>::type>
- >
+ proto::expr<proto::tag::terminal, proto::term<typename storage<T>::type> >
>
type;
};
template<typename Expr>
- actor<Expr> operator()(Expr const &expr) const
+ actor<Expr> const
+ operator()(Expr const &expr) const
{
actor<Expr> that = {expr};
return that;
@@ -169,11 +170,8 @@
template<typename T>
actor<
- proto::expr<
- proto::tag::terminal
- , proto::term<typename storage<T>::type>
- >
- >
+ proto::expr<proto::tag::terminal, proto::term<typename storage<T>::type> >
+ > const
operator()(proto::expr<proto::tag::terminal, proto::term<T &> > const &expr) const
{
actor<
@@ -189,7 +187,7 @@
////////////////////////////////////////////////////////////////////////////////////////
struct domain
: proto::domain<generator>
- {};
+ {};
////////////////////////////////////////////////////////////////////////////////////////
template<typename Sig>
@@ -219,7 +217,7 @@
BOOST_PP_REPEAT_FROM_TO(1, BOOST_PP_INC(PHOENIX_LIMIT), M0, ~)
#undef M0
}
-
+
namespace actorns_
{
////////////////////////////////////////////////////////////////////////////////////////
@@ -244,7 +242,7 @@
}
#define M0(Z, N, _) ((0))
-
+
#define M1(Z, N, _) ((0)(1))
#define M2(R, PRODUCT) M3(R, BOOST_PP_SEQ_SIZE(PRODUCT), PRODUCT)
@@ -309,7 +307,7 @@
// If the handling of a particular terminal type has been
// overridden, invoke the specified handler.
proto::when<
- proto::if_<is_terminal_extended<proto::_value>()>
+ proto::if_<detail::has_terminal_extension<proto::_value>()>
, proto::lazy<terminal_extension<proto::_value> >
>
// Otherwise, just return the value of the terminal.
@@ -324,7 +322,7 @@
#else
#if BOOST_PP_ITERATION() <= PHOENIX_PERFECT_FORWARD_LIMIT
-
+
BOOST_PP_SEQ_FOR_EACH_PRODUCT(
M2,
BOOST_PP_REPEAT(BOOST_PP_ITERATION(), M1, ~)
@@ -337,7 +335,7 @@
BOOST_PP_REPEAT(PHOENIX_PERFECT_FORWARD_LIMIT, M1, ~)
BOOST_PP_REPEAT(BOOST_PP_SUB(BOOST_PP_ITERATION(), PHOENIX_PERFECT_FORWARD_LIMIT), M0, ~)
)
-
+
#endif
#endif
Modified: branches/proto/v4/boost/phoenix/core/argument.hpp
==============================================================================
--- branches/proto/v4/boost/phoenix/core/argument.hpp (original)
+++ branches/proto/v4/boost/phoenix/core/argument.hpp 2008-05-12 02:59:01 EDT (Mon, 12 May 2008)
@@ -1,7 +1,7 @@
/*=============================================================================
Copyright (c) 2001-2007 Joel de Guzman
- Distributed under the Boost Software License, Version 1.0. (See accompanying
+ Distributed under 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)
==============================================================================*/
#ifndef BOOST_PHOENIX_ARGUMENT_HPP_EAN_2008_05_10
@@ -38,22 +38,20 @@
};
////////////////////////////////////////////////////////////////////////////////////////
+ template<typename Int, typename Callable = proto::callable>
struct at : proto::callable
{
template<class Sig>
struct result;
- template<class This, class Cont, class Int>
- struct result<This(Cont, Int)>
- : fusion::result_of::at<
- typename remove_reference<Cont>::type
- , typename remove_reference<Int>::type
- >
+ template<class This, class Cont>
+ struct result<This(Cont)>
+ : fusion::result_of::at<typename remove_reference<Cont>::type, Int>
{};
- template<typename Cont, typename Int>
+ template<typename Cont>
typename fusion::result_of::at<Cont, Int>::type
- operator ()(Cont &cont, Int const &) const
+ operator ()(Cont &cont) const
{
return fusion::at<Int>(cont);
}
@@ -85,7 +83,7 @@
////////////////////////////////////////////////////////////////////////////////////////////
template<typename Int, typename Void>
struct is_terminal_nullary;
-
+
template<typename Int>
struct is_terminal_nullary<detail::argument<Int>, void>
: mpl::false_
@@ -97,7 +95,7 @@
template<typename Int>
struct terminal_extension<detail::argument<Int>, void>
- : proto::call<detail::at(proto::_data, proto::_value)>
+ : proto::call<detail::at<Int>(proto::_data)>
{};
////////////////////////////////////////////////////////////////////////////////////////////
@@ -111,7 +109,7 @@
actor<argument<1> > const _2 = {{{{}}}};
actor<argument<2> > const _3 = {{{{}}}};
}
-
+
}}
#endif
Modified: branches/proto/v4/boost/phoenix/core/limits.hpp
==============================================================================
--- branches/proto/v4/boost/phoenix/core/limits.hpp (original)
+++ branches/proto/v4/boost/phoenix/core/limits.hpp 2008-05-12 02:59:01 EDT (Mon, 12 May 2008)
@@ -1,7 +1,7 @@
/*=============================================================================
Copyright (c) 2001-2007 Joel de Guzman
- Distributed under the Boost Software License, Version 1.0. (See accompanying
+ Distributed under 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)
==============================================================================*/
#ifndef PHOENIX_CORE_LIMITS_HPP
@@ -47,7 +47,7 @@
# define BOOST_MPL_LIMIT_METAFUNCTION_ARITY PHOENIX_LIMIT
#endif
-// this include will bring in mpl::vectorN and
+// this include will bring in mpl::vectorN and
// fusion::tupleN where N is PHOENIX_ACTOR_LIMIT
#include <boost/fusion/include/vector.hpp>
Modified: branches/proto/v4/boost/phoenix/core/reference.hpp
==============================================================================
--- branches/proto/v4/boost/phoenix/core/reference.hpp (original)
+++ branches/proto/v4/boost/phoenix/core/reference.hpp 2008-05-12 02:59:01 EDT (Mon, 12 May 2008)
@@ -1,7 +1,7 @@
/*=============================================================================
Copyright (c) 2001-2007 Joel de Guzman
- Distributed under the Boost Software License, Version 1.0. (See accompanying
+ Distributed under 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)
==============================================================================*/
#ifndef BOOST_PHOENIX_REFERENCE_HPP_EAN_2008_05_10
@@ -12,23 +12,15 @@
namespace boost { namespace phoenix
{
- namespace detail
- {
- struct domain;
- }
-
////////////////////////////////////////////////////////////////////////////////////////////
template<typename T>
struct reference
- : proto::extends<typename proto::terminal<T &>::type, reference<T>, detail::domain>
+ : proto::terminal<T &>::type
{
explicit reference(T &t)
- : proto::extends<typename proto::terminal<T &>::type, reference<T>, detail::domain>(
- proto::terminal<T &>::type::make(t)
- )
+ : proto::terminal<T &>::type(proto::terminal<T &>::type::make(t))
{}
- // For backwards compatibility
operator actor<reference<T> >() const
{
actor<reference<T> > that = {*this};
@@ -38,20 +30,18 @@
////////////////////////////////////////////////////////////////////////////////////////////
template<typename T>
- actor<typename proto::terminal<T &>::type> const
+ actor<reference<T> > const
ref(T &t)
{
- actor<typename proto::terminal<T &>::type> that = {{t}};
- return that;
+ return reference<T>(t);
}
////////////////////////////////////////////////////////////////////////////////////////////
template<typename T>
- actor<typename proto::terminal<T const &>::type> const
+ actor<reference<T const> > const
cref(T const &t)
{
- actor<typename proto::terminal<T const &>::type> that = {{t}};
- return that;
+ return reference<T const>(t);
}
}}
Modified: branches/proto/v4/boost/phoenix/core/value.hpp
==============================================================================
--- branches/proto/v4/boost/phoenix/core/value.hpp (original)
+++ branches/proto/v4/boost/phoenix/core/value.hpp 2008-05-12 02:59:01 EDT (Mon, 12 May 2008)
@@ -1,34 +1,28 @@
/*=============================================================================
Copyright (c) 2001-2007 Joel de Guzman
- Distributed under the Boost Software License, Version 1.0. (See accompanying
+ Distributed under 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)
==============================================================================*/
#ifndef BOOST_PHOENIX_VALUE_HPP_EAN_2008_05_10
#define BOOST_PHOENIX_VALUE_HPP_EAN_2008_05_10
+#include <cstddef>
#include <boost/phoenix/core/limits.hpp>
#include <boost/phoenix/core/actor.hpp>
+#include <boost/phoenix/core/reference.hpp>
namespace boost { namespace phoenix
{
- namespace detail
- {
- struct domain;
- }
-
////////////////////////////////////////////////////////////////////////////////////////////
template<typename T>
struct value
- : proto::extends<typename proto::terminal<T>::type, value<T>, detail::domain>
+ : proto::terminal<T>::type
{
explicit value(T const &t)
- : proto::extends<typename proto::terminal<T>::type, value<T>, detail::domain>(
- proto::terminal<T>::type::make(t)
- )
+ : proto::terminal<T>::type(proto::terminal<T>::type::make(t))
{}
- // For backwards compatibility
operator actor<value<T> >() const
{
actor<value<T> > that = {*this};
@@ -38,27 +32,26 @@
////////////////////////////////////////////////////////////////////////////////////////////
template<typename T>
- actor<typename proto::terminal<T>::type> const
+ actor<value<T> > const
val(T const &t)
{
- actor<typename proto::terminal<T>::type> that = {{t}};
- return that;
+ return value<T>(t);
}
+ ////////////////////////////////////////////////////////////////////////////////////////////
template<typename T, std::size_t N>
- actor<typename proto::terminal<T(&)[N]>::type> const
+ actor<reference<T[N]> > const
val(T (&t)[N])
{
- actor<typename proto::terminal<T(&)[N]>::type> that = {{t}};
- return that;
+ return reference<T[N]>(t);
}
+ ////////////////////////////////////////////////////////////////////////////////////////////
template<typename T, std::size_t N>
- actor<typename proto::terminal<T const(&)[N]>::type> const
+ actor<reference<T const[N]> > const
val(T const (&t)[N])
{
- actor<typename proto::terminal<T const(&)[N]>::type> that = {{t}};
- return that;
+ return reference<T const[N]>(t);
}
}}
Modified: branches/proto/v4/boost/phoenix/operator.hpp
==============================================================================
--- branches/proto/v4/boost/phoenix/operator.hpp (original)
+++ branches/proto/v4/boost/phoenix/operator.hpp 2008-05-12 02:59:01 EDT (Mon, 12 May 2008)
@@ -1,7 +1,7 @@
/*=============================================================================
Copyright (c) 2001-2007 Joel de Guzman
- Distributed under the Boost Software License, Version 1.0. (See accompanying
+ Distributed under 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)
==============================================================================*/
#ifndef PHOENIX_OPERATOR_HPP
Modified: branches/proto/v4/boost/phoenix/operator/if_else.hpp
==============================================================================
--- branches/proto/v4/boost/phoenix/operator/if_else.hpp (original)
+++ branches/proto/v4/boost/phoenix/operator/if_else.hpp 2008-05-12 02:59:01 EDT (Mon, 12 May 2008)
@@ -1,7 +1,7 @@
/*=============================================================================
Copyright (c) 2001-2007 Joel de Guzman
- Distributed under the Boost Software License, Version 1.0. (See accompanying
+ Distributed under 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)
==============================================================================*/
#ifndef PHOENIX_OPERATOR_IF_ELSE_HPP
Modified: branches/proto/v4/boost/phoenix/operator/io.hpp
==============================================================================
--- branches/proto/v4/boost/phoenix/operator/io.hpp (original)
+++ branches/proto/v4/boost/phoenix/operator/io.hpp 2008-05-12 02:59:01 EDT (Mon, 12 May 2008)
@@ -1,7 +1,7 @@
/*=============================================================================
Copyright (c) 2001-2007 Joel de Guzman
- Distributed under the Boost Software License, Version 1.0. (See accompanying
+ Distributed under 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)
==============================================================================*/
#ifndef PHOENIX_OPERATOR_IO_HPP
Modified: branches/proto/v4/boost/phoenix/statement.hpp
==============================================================================
--- branches/proto/v4/boost/phoenix/statement.hpp (original)
+++ branches/proto/v4/boost/phoenix/statement.hpp 2008-05-12 02:59:01 EDT (Mon, 12 May 2008)
@@ -1,7 +1,7 @@
/*=============================================================================
Copyright (c) 2001-2007 Joel de Guzman
- Distributed under the Boost Software License, Version 1.0. (See accompanying
+ Distributed under 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)
==============================================================================*/
#ifndef PHOENIX_STATEMENT_HPP
Modified: branches/proto/v4/boost/phoenix/statement/if.hpp
==============================================================================
--- branches/proto/v4/boost/phoenix/statement/if.hpp (original)
+++ branches/proto/v4/boost/phoenix/statement/if.hpp 2008-05-12 02:59:01 EDT (Mon, 12 May 2008)
@@ -1,7 +1,7 @@
/*=============================================================================
Copyright (c) 2001-2007 Joel de Guzman
- Distributed under the Boost Software License, Version 1.0. (See accompanying
+ Distributed under 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)
==============================================================================*/
#ifndef BOOST_PHOENIX_IF_HPP_EAN_2008_05_09
@@ -9,34 +9,15 @@
#include <boost/ref.hpp>
#include <boost/mpl/void.hpp>
-#include <boost/proto/proto.hpp>
+#include <boost/phoenix/core/actor.hpp>
#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable: 4355) // 'this' : used in base member initializer list
+# pragma warning(push)
+# pragma warning(disable: 4355) // 'this' : used in base member initializer list
#endif
namespace boost { namespace phoenix
{
- template<typename Tag, typename Void>
- struct extension;
-
- namespace actorns_
- {
- template<typename Expr>
- struct actor;
- }
-
- using actorns_::actor;
-
- namespace detail
- {
- struct domain;
- struct evaluator;
- }
-
- using detail::evaluator;
-
////////////////////////////////////////////////////////////////////////////////////////////
namespace tag
{
@@ -190,7 +171,7 @@
, detail::if_evaluator
>
{};
-
+
////////////////////////////////////////////////////////////////////////////////////////////
template<>
struct extension<tag::else_, void>
@@ -199,11 +180,11 @@
, detail::if_else_evaluator
>
{};
-
+
}}
#ifdef _MSC_VER
-#pragma warning(pop)
+# pragma warning(pop)
#endif
#endif
Modified: branches/proto/v4/boost/phoenix/version.hpp
==============================================================================
--- branches/proto/v4/boost/phoenix/version.hpp (original)
+++ branches/proto/v4/boost/phoenix/version.hpp 2008-05-12 02:59:01 EDT (Mon, 12 May 2008)
@@ -2,7 +2,7 @@
Copyright (c) 2005-2008 Hartmut Kaiser
Copyright (c) 2005-2007 Joel de Guzman
- Distributed under the Boost Software License, Version 1.0. (See accompanying
+ Distributed under 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)
==============================================================================*/
#ifndef PHOENIX_VERSION_HPP
Modified: branches/proto/v4/libs/phoenix/test/algorithm/iteration.cpp
==============================================================================
--- branches/proto/v4/libs/phoenix/test/algorithm/iteration.cpp (original)
+++ branches/proto/v4/libs/phoenix/test/algorithm/iteration.cpp 2008-05-12 02:59:01 EDT (Mon, 12 May 2008)
@@ -2,7 +2,7 @@
Copyright (c) 2005-2007 Dan Marsden
Copyright (c) 2005-2007 Joel de Guzman
- Distributed under the Boost Software License, Version 1.0. (See accompanying
+ Distributed under 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)
==============================================================================*/
Modified: branches/proto/v4/libs/phoenix/test/algorithm/querying.cpp
==============================================================================
--- branches/proto/v4/libs/phoenix/test/algorithm/querying.cpp (original)
+++ branches/proto/v4/libs/phoenix/test/algorithm/querying.cpp 2008-05-12 02:59:01 EDT (Mon, 12 May 2008)
@@ -3,7 +3,7 @@
Copyright (c) 2005-2007 Joel de Guzman
Copyright (c) 2007 Hartmut Kaiser
- Distributed under the Boost Software License, Version 1.0. (See accompanying
+ Distributed under 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)
==============================================================================*/
@@ -127,11 +127,11 @@
int search[] = {1,2,4};
BOOST_TEST(
- mismatch(arg1, arg2)(array, search) ==
+ mismatch(arg1, arg2)(array, search) ==
std::make_pair(array + 2, search + 2));
int search2[] = {1,2,1,1};
BOOST_TEST(
- mismatch(arg1, arg2, mod_2_comparison())(array, search2)
+ mismatch(arg1, arg2, mod_2_comparison())(array, search2)
== std::make_pair(array + 3, search2 + 3));
return;
@@ -212,26 +212,26 @@
using namespace boost::phoenix::arg_names;
int array[] = {1,2,2,3};
const std::set<int> test_set(array, array + 4);
- BOOST_TEST(equal_range(arg1, 2)(array).first ==
+ BOOST_TEST(equal_range(arg1, 2)(array).first ==
array + 1);
- BOOST_TEST(equal_range(arg1, 2)(array).second ==
+ BOOST_TEST(equal_range(arg1, 2)(array).second ==
array + 3);
- BOOST_TEST(equal_range(arg1, 2)(test_set).first ==
+ BOOST_TEST(equal_range(arg1, 2)(test_set).first ==
test_set.equal_range(2).first);
- BOOST_TEST(equal_range(arg1, 2)(test_set).second ==
+ BOOST_TEST(equal_range(arg1, 2)(test_set).second ==
test_set.equal_range(2).second);
int array2[] = {3,2,2,1};
const std::set<int, std::greater<int> > test_set2(array2, array2 + 4);
- BOOST_TEST(boost::phoenix::equal_range(arg1, 2, std::greater<int>())(array2).first ==
+ BOOST_TEST(boost::phoenix::equal_range(arg1, 2, std::greater<int>())(array2).first ==
array2 + 1);
- BOOST_TEST(boost::phoenix::equal_range(arg1, 2, std::greater<int>())(array2).second ==
+ BOOST_TEST(boost::phoenix::equal_range(arg1, 2, std::greater<int>())(array2).second ==
array2 + 3);
- BOOST_TEST(boost::phoenix::equal_range(arg1, 2, std::greater<int>())(test_set2).first ==
+ BOOST_TEST(boost::phoenix::equal_range(arg1, 2, std::greater<int>())(test_set2).first ==
test_set2.equal_range(2).first);
- BOOST_TEST(boost::phoenix::equal_range(arg1, 2, std::greater<int>())(test_set2).second ==
+ BOOST_TEST(boost::phoenix::equal_range(arg1, 2, std::greater<int>())(test_set2).second ==
test_set2.equal_range(2).second);
return;
Modified: branches/proto/v4/libs/phoenix/test/algorithm/querying2.cpp
==============================================================================
--- branches/proto/v4/libs/phoenix/test/algorithm/querying2.cpp (original)
+++ branches/proto/v4/libs/phoenix/test/algorithm/querying2.cpp 2008-05-12 02:59:01 EDT (Mon, 12 May 2008)
@@ -2,7 +2,7 @@
Copyright (c) 2005-2007 Dan Marsden
Copyright (c) 2005-2007 Joel de Guzman
- Distributed under the Boost Software License, Version 1.0. (See accompanying
+ Distributed under 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)
==============================================================================*/
Modified: branches/proto/v4/libs/phoenix/test/algorithm/transformation1.cpp
==============================================================================
--- branches/proto/v4/libs/phoenix/test/algorithm/transformation1.cpp (original)
+++ branches/proto/v4/libs/phoenix/test/algorithm/transformation1.cpp 2008-05-12 02:59:01 EDT (Mon, 12 May 2008)
@@ -2,7 +2,7 @@
Copyright (c) 2005-2007 Dan Marsden
Copyright (c) 2005-2007 Joel de Guzman
- Distributed under the Boost Software License, Version 1.0. (See accompanying
+ Distributed under 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)
==============================================================================*/
@@ -92,7 +92,7 @@
using namespace boost::phoenix::arg_names;
int array[] = {1,2,3};
BOOST_TEST(
- transform(arg1, arg2, increment())(array, array) ==
+ transform(arg1, arg2, increment())(array, array) ==
array + 3);
BOOST_TEST(array[0] == 2);
BOOST_TEST(array[1] == 3);
@@ -100,7 +100,7 @@
int array2[] = {1,2,3};
BOOST_TEST(
- boost::phoenix::transform(arg1, arg2, arg3, std::plus<int>())(array, array2, array) ==
+ boost::phoenix::transform(arg1, arg2, arg3, std::plus<int>())(array, array2, array) ==
array +3);
BOOST_TEST(array[0] == 2 + 1);
BOOST_TEST(array[1] == 3 + 2);
@@ -298,12 +298,12 @@
BOOST_TEST(unique(arg1, mod_2_comparison())(array2) == array2 + 2);
BOOST_TEST(array2[0] == 1);
BOOST_TEST(array2[1] == 2);
-
+
BOOST_TEST(unique(arg1, mod_2_comparison())(test_list2) == test_list2.end());
std::list<int>::const_iterator jt(test_list2.begin());
BOOST_TEST(*jt++ == 1);
BOOST_TEST(*jt++ == 2);
-
+
return;
}
@@ -323,7 +323,7 @@
BOOST_TEST(unique_copy(arg1, arg2, mod_2_comparison())(array2, out2) == out2 + 2);
BOOST_TEST(out2[0] == 1);
BOOST_TEST(out2[1] == 2);
-
+
return;
}
Modified: branches/proto/v4/libs/phoenix/test/algorithm/transformation2.cpp
==============================================================================
--- branches/proto/v4/libs/phoenix/test/algorithm/transformation2.cpp (original)
+++ branches/proto/v4/libs/phoenix/test/algorithm/transformation2.cpp 2008-05-12 02:59:01 EDT (Mon, 12 May 2008)
@@ -2,7 +2,7 @@
Copyright (c) 2005-2007 Dan Marsden
Copyright (c) 2005-2007 Joel de Guzman
- Distributed under the Boost Software License, Version 1.0. (See accompanying
+ Distributed under 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)
==============================================================================*/
@@ -32,7 +32,7 @@
BOOST_TEST(array[0] == 2);
BOOST_TEST(array[1] == 3);
BOOST_TEST(array[2] == 1);
-
+
return;
}
@@ -46,7 +46,7 @@
BOOST_TEST(array2[0] == 2);
BOOST_TEST(array2[1] == 3);
BOOST_TEST(array2[2] == 1);
-
+
return;
}
@@ -66,7 +66,7 @@
BOOST_TEST(first != third && second != third);
return;
}
-
+
void partition_test()
{
using namespace boost::phoenix;
@@ -138,7 +138,7 @@
BOOST_TEST(array[0] == 3);
BOOST_TEST(array[1] == 2);
BOOST_TEST(array[2] == 1);
-
+
return;
}
Modified: branches/proto/v4/libs/phoenix/test/algorithm/transformation3.cpp
==============================================================================
--- branches/proto/v4/libs/phoenix/test/algorithm/transformation3.cpp (original)
+++ branches/proto/v4/libs/phoenix/test/algorithm/transformation3.cpp 2008-05-12 02:59:01 EDT (Mon, 12 May 2008)
@@ -2,7 +2,7 @@
Copyright (c) 2005-2007 Dan Marsden
Copyright (c) 2005-2007 Joel de Guzman
- Distributed under the Boost Software License, Version 1.0. (See accompanying
+ Distributed under 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)
==============================================================================*/
@@ -89,7 +89,7 @@
int array4[] = {4,3,2};
int output2[4];
BOOST_TEST(boost::phoenix::set_union(arg1, arg2, arg3, std::greater<int>())
- (array3, array4, output2) ==
+ (array3, array4, output2) ==
output2 + 4);
int expected_result2[] = {4,3,2,1};
BOOST_TEST(std::equal(output2, output2 + 4, expected_result2));
@@ -111,7 +111,7 @@
int array4[] = {4,3,2};
int output2[2];
BOOST_TEST(boost::phoenix::set_intersection(arg1, arg2, arg3, std::greater<int>())
- (array3, array4, output2) ==
+ (array3, array4, output2) ==
output2 + 2);
int expected_result2[] = {3,2};
BOOST_TEST(std::equal(output2, output2 + 2, expected_result2));
@@ -133,7 +133,7 @@
int array4[] = {4,3,2};
int output2[1];
BOOST_TEST(boost::phoenix::set_difference(arg1, arg2, arg3, std::greater<int>())
- (array3, array4, output2) ==
+ (array3, array4, output2) ==
output2 + 1);
int expected_result2[] = {1};
BOOST_TEST(std::equal(output2, output2 + 1, expected_result2));
@@ -155,7 +155,7 @@
int array4[] = {4,3,2};
int output2[2];
BOOST_TEST(boost::phoenix::set_symmetric_difference(arg1, arg2, arg3, std::greater<int>())
- (array3, array4, output2) ==
+ (array3, array4, output2) ==
output2 + 2);
int expected_result2[] = {4,1};
BOOST_TEST(std::equal(output2, output2 + 2, expected_result2));
Modified: branches/proto/v4/libs/phoenix/test/algorithm/transformation4.cpp
==============================================================================
--- branches/proto/v4/libs/phoenix/test/algorithm/transformation4.cpp (original)
+++ branches/proto/v4/libs/phoenix/test/algorithm/transformation4.cpp 2008-05-12 02:59:01 EDT (Mon, 12 May 2008)
@@ -2,7 +2,7 @@
Copyright (c) 2005-2007 Dan Marsden
Copyright (c) 2005-2007 Joel de Guzman
- Distributed under the Boost Software License, Version 1.0. (See accompanying
+ Distributed under 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)
==============================================================================*/
Modified: branches/proto/v4/libs/phoenix/test/bind/bind_function_object_tests.cpp
==============================================================================
--- branches/proto/v4/libs/phoenix/test/bind/bind_function_object_tests.cpp (original)
+++ branches/proto/v4/libs/phoenix/test/bind/bind_function_object_tests.cpp 2008-05-12 02:59:01 EDT (Mon, 12 May 2008)
@@ -1,7 +1,7 @@
/*=============================================================================
Copyright (c) 2001-2007 Joel de Guzman
- Distributed under the Boost Software License, Version 1.0. (See accompanying
+ Distributed under the Boost Software License, Version 1.0. (See accompanying
file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
==============================================================================*/
#include <iostream>
Modified: branches/proto/v4/libs/phoenix/test/bind/bind_function_tests.cpp
==============================================================================
--- branches/proto/v4/libs/phoenix/test/bind/bind_function_tests.cpp (original)
+++ branches/proto/v4/libs/phoenix/test/bind/bind_function_tests.cpp 2008-05-12 02:59:01 EDT (Mon, 12 May 2008)
@@ -1,7 +1,7 @@
/*=============================================================================
Copyright (c) 2001-2007 Joel de Guzman
- Distributed under the Boost Software License, Version 1.0. (See accompanying
+ Distributed under the Boost Software License, Version 1.0. (See accompanying
file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
==============================================================================*/
#include <iostream>
Modified: branches/proto/v4/libs/phoenix/test/bind/bind_member_function_tests.cpp
==============================================================================
--- branches/proto/v4/libs/phoenix/test/bind/bind_member_function_tests.cpp (original)
+++ branches/proto/v4/libs/phoenix/test/bind/bind_member_function_tests.cpp 2008-05-12 02:59:01 EDT (Mon, 12 May 2008)
@@ -1,7 +1,7 @@
/*=============================================================================
Copyright (c) 2001-2007 Joel de Guzman
- Distributed under the Boost Software License, Version 1.0. (See accompanying
+ Distributed under the Boost Software License, Version 1.0. (See accompanying
file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
==============================================================================*/
#include <iostream>
Modified: branches/proto/v4/libs/phoenix/test/bind/bind_member_variable_tests.cpp
==============================================================================
--- branches/proto/v4/libs/phoenix/test/bind/bind_member_variable_tests.cpp (original)
+++ branches/proto/v4/libs/phoenix/test/bind/bind_member_variable_tests.cpp 2008-05-12 02:59:01 EDT (Mon, 12 May 2008)
@@ -1,7 +1,7 @@
/*=============================================================================
Copyright (c) 2001-2007 Joel de Guzman
- Distributed under the Boost Software License, Version 1.0. (See accompanying
+ Distributed under the Boost Software License, Version 1.0. (See accompanying
file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
==============================================================================*/
#include <iostream>
Modified: branches/proto/v4/libs/phoenix/test/container/container_tests.hpp
==============================================================================
--- branches/proto/v4/libs/phoenix/test/container/container_tests.hpp (original)
+++ branches/proto/v4/libs/phoenix/test/container/container_tests.hpp 2008-05-12 02:59:01 EDT (Mon, 12 May 2008)
@@ -1,7 +1,7 @@
/*=============================================================================
Copyright (c) 2004 Angus Leeming
- Distributed under the Boost Software License, Version 1.0. (See accompanying
+ Distributed under 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)
==============================================================================*/
#if !defined(CONTAINER_TESTS_HPP)
Modified: branches/proto/v4/libs/phoenix/test/container/container_tests1a.cpp
==============================================================================
--- branches/proto/v4/libs/phoenix/test/container/container_tests1a.cpp (original)
+++ branches/proto/v4/libs/phoenix/test/container/container_tests1a.cpp 2008-05-12 02:59:01 EDT (Mon, 12 May 2008)
@@ -1,7 +1,7 @@
/*=============================================================================
Copyright (c) 2004 Angus Leeming
- Distributed under the Boost Software License, Version 1.0. (See accompanying
+ Distributed under the Boost Software License, Version 1.0. (See accompanying
file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
==============================================================================*/
#include "container_tests.hpp"
@@ -32,7 +32,7 @@
return data;
}
-int
+int
main()
{
std::list<int> const data = build_list();
Modified: branches/proto/v4/libs/phoenix/test/container/container_tests1b.cpp
==============================================================================
--- branches/proto/v4/libs/phoenix/test/container/container_tests1b.cpp (original)
+++ branches/proto/v4/libs/phoenix/test/container/container_tests1b.cpp 2008-05-12 02:59:01 EDT (Mon, 12 May 2008)
@@ -1,7 +1,7 @@
/*=============================================================================
Copyright (c) 2004 Angus Leeming
- Distributed under the Boost Software License, Version 1.0. (See accompanying
+ Distributed under the Boost Software License, Version 1.0. (See accompanying
file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
==============================================================================*/
#include "container_tests.hpp"
@@ -32,7 +32,7 @@
return data;
}
-int
+int
main()
{
std::list<int> const data = build_list();
Modified: branches/proto/v4/libs/phoenix/test/container/container_tests2a.cpp
==============================================================================
--- branches/proto/v4/libs/phoenix/test/container/container_tests2a.cpp (original)
+++ branches/proto/v4/libs/phoenix/test/container/container_tests2a.cpp 2008-05-12 02:59:01 EDT (Mon, 12 May 2008)
@@ -1,7 +1,7 @@
/*=============================================================================
Copyright (c) 2004 Angus Leeming
- Distributed under the Boost Software License, Version 1.0. (See accompanying
+ Distributed under the Boost Software License, Version 1.0. (See accompanying
file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
==============================================================================*/
#include "container_tests.hpp"
Modified: branches/proto/v4/libs/phoenix/test/container/container_tests2b.cpp
==============================================================================
--- branches/proto/v4/libs/phoenix/test/container/container_tests2b.cpp (original)
+++ branches/proto/v4/libs/phoenix/test/container/container_tests2b.cpp 2008-05-12 02:59:01 EDT (Mon, 12 May 2008)
@@ -1,7 +1,7 @@
/*=============================================================================
Copyright (c) 2004 Angus Leeming
- Distributed under the Boost Software License, Version 1.0. (See accompanying
+ Distributed under the Boost Software License, Version 1.0. (See accompanying
file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
==============================================================================*/
#include "container_tests.hpp"
Modified: branches/proto/v4/libs/phoenix/test/container/container_tests3a.cpp
==============================================================================
--- branches/proto/v4/libs/phoenix/test/container/container_tests3a.cpp (original)
+++ branches/proto/v4/libs/phoenix/test/container/container_tests3a.cpp 2008-05-12 02:59:01 EDT (Mon, 12 May 2008)
@@ -1,7 +1,7 @@
/*=============================================================================
Copyright (c) 2004 Angus Leeming
- Distributed under the Boost Software License, Version 1.0. (See accompanying
+ Distributed under the Boost Software License, Version 1.0. (See accompanying
file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
==============================================================================*/
#include "container_tests.hpp"
Modified: branches/proto/v4/libs/phoenix/test/container/container_tests3b.cpp
==============================================================================
--- branches/proto/v4/libs/phoenix/test/container/container_tests3b.cpp (original)
+++ branches/proto/v4/libs/phoenix/test/container/container_tests3b.cpp 2008-05-12 02:59:01 EDT (Mon, 12 May 2008)
@@ -1,7 +1,7 @@
/*=============================================================================
Copyright (c) 2004 Angus Leeming
- Distributed under the Boost Software License, Version 1.0. (See accompanying
+ Distributed under the Boost Software License, Version 1.0. (See accompanying
file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
==============================================================================*/
#include "container_tests.hpp"
Modified: branches/proto/v4/libs/phoenix/test/container/container_tests4a.cpp
==============================================================================
--- branches/proto/v4/libs/phoenix/test/container/container_tests4a.cpp (original)
+++ branches/proto/v4/libs/phoenix/test/container/container_tests4a.cpp 2008-05-12 02:59:01 EDT (Mon, 12 May 2008)
@@ -1,7 +1,7 @@
/*=============================================================================
Copyright (c) 2004 Angus Leeming
- Distributed under the Boost Software License, Version 1.0. (See accompanying
+ Distributed under the Boost Software License, Version 1.0. (See accompanying
file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
==============================================================================*/
#include "container_tests.hpp"
Modified: branches/proto/v4/libs/phoenix/test/container/container_tests4b.cpp
==============================================================================
--- branches/proto/v4/libs/phoenix/test/container/container_tests4b.cpp (original)
+++ branches/proto/v4/libs/phoenix/test/container/container_tests4b.cpp 2008-05-12 02:59:01 EDT (Mon, 12 May 2008)
@@ -1,7 +1,7 @@
/*=============================================================================
Copyright (c) 2004 Angus Leeming
- Distributed under the Boost Software License, Version 1.0. (See accompanying
+ Distributed under the Boost Software License, Version 1.0. (See accompanying
file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
==============================================================================*/
#include "container_tests.hpp"
Modified: branches/proto/v4/libs/phoenix/test/container/container_tests5a.cpp
==============================================================================
--- branches/proto/v4/libs/phoenix/test/container/container_tests5a.cpp (original)
+++ branches/proto/v4/libs/phoenix/test/container/container_tests5a.cpp 2008-05-12 02:59:01 EDT (Mon, 12 May 2008)
@@ -1,7 +1,7 @@
/*=============================================================================
Copyright (c) 2004 Angus Leeming
- Distributed under the Boost Software License, Version 1.0. (See accompanying
+ Distributed under the Boost Software License, Version 1.0. (See accompanying
file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
==============================================================================*/
#include "container_tests.hpp"
Modified: branches/proto/v4/libs/phoenix/test/container/container_tests5b.cpp
==============================================================================
--- branches/proto/v4/libs/phoenix/test/container/container_tests5b.cpp (original)
+++ branches/proto/v4/libs/phoenix/test/container/container_tests5b.cpp 2008-05-12 02:59:01 EDT (Mon, 12 May 2008)
@@ -1,7 +1,7 @@
/*=============================================================================
Copyright (c) 2004 Angus Leeming
- Distributed under the Boost Software License, Version 1.0. (See accompanying
+ Distributed under the Boost Software License, Version 1.0. (See accompanying
file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
==============================================================================*/
#include "container_tests.hpp"
Modified: branches/proto/v4/libs/phoenix/test/container/container_tests6a.cpp
==============================================================================
--- branches/proto/v4/libs/phoenix/test/container/container_tests6a.cpp (original)
+++ branches/proto/v4/libs/phoenix/test/container/container_tests6a.cpp 2008-05-12 02:59:01 EDT (Mon, 12 May 2008)
@@ -1,7 +1,7 @@
/*=============================================================================
Copyright (c) 2004 Angus Leeming
- Distributed under the Boost Software License, Version 1.0. (See accompanying
+ Distributed under the Boost Software License, Version 1.0. (See accompanying
file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
==============================================================================*/
#include "container_tests.hpp"
Modified: branches/proto/v4/libs/phoenix/test/container/container_tests6b.cpp
==============================================================================
--- branches/proto/v4/libs/phoenix/test/container/container_tests6b.cpp (original)
+++ branches/proto/v4/libs/phoenix/test/container/container_tests6b.cpp 2008-05-12 02:59:01 EDT (Mon, 12 May 2008)
@@ -1,7 +1,7 @@
/*=============================================================================
Copyright (c) 2004 Angus Leeming
- Distributed under the Boost Software License, Version 1.0. (See accompanying
+ Distributed under the Boost Software License, Version 1.0. (See accompanying
file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
==============================================================================*/
#include "container_tests.hpp"
Modified: branches/proto/v4/libs/phoenix/test/core/compose_tests.cpp
==============================================================================
--- branches/proto/v4/libs/phoenix/test/core/compose_tests.cpp (original)
+++ branches/proto/v4/libs/phoenix/test/core/compose_tests.cpp 2008-05-12 02:59:01 EDT (Mon, 12 May 2008)
@@ -1,7 +1,7 @@
/*=============================================================================
Copyright (c) 2001-2007 Joel de Guzman
- Distributed under the Boost Software License, Version 1.0. (See accompanying
+ Distributed under the Boost Software License, Version 1.0. (See accompanying
file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
==============================================================================*/
#include <iostream>
Modified: branches/proto/v4/libs/phoenix/test/core/primitives_tests.cpp
==============================================================================
--- branches/proto/v4/libs/phoenix/test/core/primitives_tests.cpp (original)
+++ branches/proto/v4/libs/phoenix/test/core/primitives_tests.cpp 2008-05-12 02:59:01 EDT (Mon, 12 May 2008)
@@ -1,7 +1,7 @@
/*=============================================================================
Copyright (c) 2001-2007 Joel de Guzman
- Distributed under the Boost Software License, Version 1.0. (See accompanying
+ Distributed under the Boost Software License, Version 1.0. (See accompanying
file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
==============================================================================*/
#include <iostream>
@@ -50,7 +50,7 @@
BOOST_TEST(cref(i)() == 4);
BOOST_TEST(i == 4);
BOOST_TEST(ref(++i)() == 5);
- BOOST_TEST(i == 5);
+ BOOST_TEST(i == 5);
// should not compile:
#ifdef PHOENIX_SHOULD_NOT_COMPILE_TEST
Modified: branches/proto/v4/libs/phoenix/test/function/function_tests.cpp
==============================================================================
--- branches/proto/v4/libs/phoenix/test/function/function_tests.cpp (original)
+++ branches/proto/v4/libs/phoenix/test/function/function_tests.cpp 2008-05-12 02:59:01 EDT (Mon, 12 May 2008)
@@ -1,7 +1,7 @@
/*=============================================================================
Copyright (c) 2001-2007 Joel de Guzman
- Distributed under the Boost Software License, Version 1.0. (See accompanying
+ Distributed under the Boost Software License, Version 1.0. (See accompanying
file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
==============================================================================*/
#include <iostream>
Modified: branches/proto/v4/libs/phoenix/test/object/cast_tests.cpp
==============================================================================
--- branches/proto/v4/libs/phoenix/test/object/cast_tests.cpp (original)
+++ branches/proto/v4/libs/phoenix/test/object/cast_tests.cpp 2008-05-12 02:59:01 EDT (Mon, 12 May 2008)
@@ -1,7 +1,7 @@
/*=============================================================================
Copyright (c) 2001-2007 Joel de Guzman
- Distributed under the Boost Software License, Version 1.0. (See accompanying
+ Distributed under the Boost Software License, Version 1.0. (See accompanying
file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
==============================================================================*/
#include <string>
Modified: branches/proto/v4/libs/phoenix/test/object/new_delete_tests.cpp
==============================================================================
--- branches/proto/v4/libs/phoenix/test/object/new_delete_tests.cpp (original)
+++ branches/proto/v4/libs/phoenix/test/object/new_delete_tests.cpp 2008-05-12 02:59:01 EDT (Mon, 12 May 2008)
@@ -1,7 +1,7 @@
/*=============================================================================
Copyright (c) 2001-2007 Joel de Guzman
- Distributed under the Boost Software License, Version 1.0. (See accompanying
+ Distributed under the Boost Software License, Version 1.0. (See accompanying
file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
==============================================================================*/
#include <iostream>
Modified: branches/proto/v4/libs/phoenix/test/operator/bitwise_tests.cpp
==============================================================================
--- branches/proto/v4/libs/phoenix/test/operator/bitwise_tests.cpp (original)
+++ branches/proto/v4/libs/phoenix/test/operator/bitwise_tests.cpp 2008-05-12 02:59:01 EDT (Mon, 12 May 2008)
@@ -1,7 +1,7 @@
/*=============================================================================
Copyright (c) 2001-2007 Joel de Guzman
- Distributed under the Boost Software License, Version 1.0. (See accompanying
+ Distributed under the Boost Software License, Version 1.0. (See accompanying
file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
==============================================================================*/
#include <iostream>
Modified: branches/proto/v4/libs/phoenix/test/operator/if_else_tests.cpp
==============================================================================
--- branches/proto/v4/libs/phoenix/test/operator/if_else_tests.cpp (original)
+++ branches/proto/v4/libs/phoenix/test/operator/if_else_tests.cpp 2008-05-12 02:59:01 EDT (Mon, 12 May 2008)
@@ -1,7 +1,7 @@
/*=============================================================================
Copyright (c) 2001-2007 Joel de Guzman
- Distributed under the Boost Software License, Version 1.0. (See accompanying
+ Distributed under the Boost Software License, Version 1.0. (See accompanying
file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
==============================================================================*/
#include <boost/detail/lightweight_test.hpp>
Modified: branches/proto/v4/libs/phoenix/test/operator/io_tests.cpp
==============================================================================
--- branches/proto/v4/libs/phoenix/test/operator/io_tests.cpp (original)
+++ branches/proto/v4/libs/phoenix/test/operator/io_tests.cpp 2008-05-12 02:59:01 EDT (Mon, 12 May 2008)
@@ -1,7 +1,7 @@
/*=============================================================================
Copyright (c) 2001-2007 Joel de Guzman
- Distributed under the Boost Software License, Version 1.0. (See accompanying
+ Distributed under the Boost Software License, Version 1.0. (See accompanying
file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
==============================================================================*/
#include <iostream>
Modified: branches/proto/v4/libs/phoenix/test/operator/logical_tests.cpp
==============================================================================
--- branches/proto/v4/libs/phoenix/test/operator/logical_tests.cpp (original)
+++ branches/proto/v4/libs/phoenix/test/operator/logical_tests.cpp 2008-05-12 02:59:01 EDT (Mon, 12 May 2008)
@@ -1,7 +1,7 @@
/*=============================================================================
Copyright (c) 2001-2007 Joel de Guzman
- Distributed under the Boost Software License, Version 1.0. (See accompanying
+ Distributed under the Boost Software License, Version 1.0. (See accompanying
file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
==============================================================================*/
#include <boost/detail/lightweight_test.hpp>
Modified: branches/proto/v4/libs/phoenix/test/operator/member.cpp
==============================================================================
--- branches/proto/v4/libs/phoenix/test/operator/member.cpp (original)
+++ branches/proto/v4/libs/phoenix/test/operator/member.cpp 2008-05-12 02:59:01 EDT (Mon, 12 May 2008)
@@ -2,7 +2,7 @@
Copyright (c) 2005-2007 Dan Marsden
Copyright (c) 2005-2007 Joel de Guzman
- Distributed under the Boost Software License, Version 1.0. (See accompanying
+ Distributed under 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)
==============================================================================*/
Modified: branches/proto/v4/libs/phoenix/test/operator/misc_binary_tests.cpp
==============================================================================
--- branches/proto/v4/libs/phoenix/test/operator/misc_binary_tests.cpp (original)
+++ branches/proto/v4/libs/phoenix/test/operator/misc_binary_tests.cpp 2008-05-12 02:59:01 EDT (Mon, 12 May 2008)
@@ -1,7 +1,7 @@
/*=============================================================================
Copyright (c) 2001-2007 Joel de Guzman
- Distributed under the Boost Software License, Version 1.0. (See accompanying
+ Distributed under the Boost Software License, Version 1.0. (See accompanying
file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
==============================================================================*/
#include <string>
Modified: branches/proto/v4/libs/phoenix/test/operator/self_tests.cpp
==============================================================================
--- branches/proto/v4/libs/phoenix/test/operator/self_tests.cpp (original)
+++ branches/proto/v4/libs/phoenix/test/operator/self_tests.cpp 2008-05-12 02:59:01 EDT (Mon, 12 May 2008)
@@ -1,7 +1,7 @@
/*=============================================================================
Copyright (c) 2001-2007 Joel de Guzman
- Distributed under the Boost Software License, Version 1.0. (See accompanying
+ Distributed under the Boost Software License, Version 1.0. (See accompanying
file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
==============================================================================*/
#include <vector>
Modified: branches/proto/v4/libs/phoenix/test/operator/unary_tests.cpp
==============================================================================
--- branches/proto/v4/libs/phoenix/test/operator/unary_tests.cpp (original)
+++ branches/proto/v4/libs/phoenix/test/operator/unary_tests.cpp 2008-05-12 02:59:01 EDT (Mon, 12 May 2008)
@@ -1,7 +1,7 @@
/*=============================================================================
Copyright (c) 2001-2007 Joel de Guzman
- Distributed under the Boost Software License, Version 1.0. (See accompanying
+ Distributed under the Boost Software License, Version 1.0. (See accompanying
file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
==============================================================================*/
#include <boost/detail/lightweight_test.hpp>
Modified: branches/proto/v4/libs/phoenix/test/scope/bug_000008.cpp
==============================================================================
--- branches/proto/v4/libs/phoenix/test/scope/bug_000008.cpp (original)
+++ branches/proto/v4/libs/phoenix/test/scope/bug_000008.cpp 2008-05-12 02:59:01 EDT (Mon, 12 May 2008)
@@ -2,7 +2,7 @@
Copyright (c) 2003 Martin Wille
Copyright (c) 2001-2007 Joel de Guzman
- Distributed under the Boost Software License, Version 1.0. (See accompanying
+ Distributed under 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)
=============================================================================*/
Modified: branches/proto/v4/libs/phoenix/test/scope/dynamic_tests.cpp
==============================================================================
--- branches/proto/v4/libs/phoenix/test/scope/dynamic_tests.cpp (original)
+++ branches/proto/v4/libs/phoenix/test/scope/dynamic_tests.cpp 2008-05-12 02:59:01 EDT (Mon, 12 May 2008)
@@ -1,7 +1,7 @@
/*=============================================================================
Copyright (c) 2001-2007 Joel de Guzman
- Distributed under the Boost Software License, Version 1.0. (See accompanying
+ Distributed under the Boost Software License, Version 1.0. (See accompanying
file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
==============================================================================*/
#include <iostream>
@@ -66,7 +66,7 @@
(std::cout << clos.message << clos.num << ", " << clos.real << '\n')();
BOOST_TEST(clos.num() == 987);
BOOST_TEST(clos.real() == clos.num() * 1e30);
- BOOST_TEST(clos.message() == "Abracadabra ");
+ BOOST_TEST(clos.message() == "Abracadabra ");
}
(std::cout << clos.message << clos.num << ", " << clos.real << '\n')();
Modified: branches/proto/v4/libs/phoenix/test/scope/lambda_tests.cpp
==============================================================================
--- branches/proto/v4/libs/phoenix/test/scope/lambda_tests.cpp (original)
+++ branches/proto/v4/libs/phoenix/test/scope/lambda_tests.cpp 2008-05-12 02:59:01 EDT (Mon, 12 May 2008)
@@ -1,7 +1,7 @@
/*=============================================================================
Copyright (c) 2001-2007 Joel de Guzman
- Distributed under the Boost Software License, Version 1.0. (See accompanying
+ Distributed under the Boost Software License, Version 1.0. (See accompanying
file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
==============================================================================*/
#include <iostream>
@@ -69,7 +69,7 @@
int y = lambda[_1]()(x);
BOOST_TEST(x == y);
}
-
+
{
int x = 1, y = 10;
BOOST_TEST(
@@ -79,7 +79,7 @@
(_1 + lambda[-_1])(x)(y) == 1+-10
);
}
-
+
{
int x = 1, y = 10, z = 13;
BOOST_TEST(
@@ -107,12 +107,12 @@
zzz z;
BOOST_TEST(lambda[_1](x)(y) == y);
- BOOST_TEST(lambda(_a = _1)[_a](x)(y) == x);
+ BOOST_TEST(lambda(_a = _1)[_a](x)(y) == x);
BOOST_TEST(lambda(_a = _1)[lambda[_a]](x)(y)(z) == x);
BOOST_TEST(lambda(_a = _1)[lambda[_a + _1]](x)(y)(x) == 2);
BOOST_TEST(lambda(_a = _1)[lambda(_b = _1)[_a + _b + _1]](x)(x2)(x3) == 6);
}
-
+
{
int x = 1, y = 10;
BOOST_TEST(
@@ -132,7 +132,7 @@
(x)(y)(y) == 1+1+1+2
);
}
-
+
{
using boost::phoenix::for_each;
Modified: branches/proto/v4/libs/phoenix/test/scope/let_tests.cpp
==============================================================================
--- branches/proto/v4/libs/phoenix/test/scope/let_tests.cpp (original)
+++ branches/proto/v4/libs/phoenix/test/scope/let_tests.cpp 2008-05-12 02:59:01 EDT (Mon, 12 May 2008)
@@ -1,7 +1,7 @@
/*=============================================================================
Copyright (c) 2001-2007 Joel de Guzman
- Distributed under the Boost Software License, Version 1.0. (See accompanying
+ Distributed under the Boost Software License, Version 1.0. (See accompanying
file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
==============================================================================*/
#include <iostream>
@@ -35,7 +35,7 @@
(x) == x
);
}
-
+
{
int x = 1, y = 10;
BOOST_TEST(
@@ -64,10 +64,10 @@
{
int x = 1, y = 10;
BOOST_TEST(
- let(_x = _1)
+ let(_x = _1)
[
_x +
- let(_x = _2)
+ let(_x = _2)
[
-_x
]
@@ -75,7 +75,7 @@
(x, y) == x + -y
);
}
-
+
{
int x = 999;
BOOST_TEST(
@@ -85,23 +85,23 @@
]
(x) == 999 + 888
);
-
- BOOST_TEST(x == 888 + 999);
+
+ BOOST_TEST(x == 888 + 999);
}
{
int x = 999;
BOOST_TEST(
- let(_x = val(_1)) // _x holds x by value
+ let(_x = val(_1)) // _x holds x by value
[
val(_x += 888)
]
(x) == x + 888
);
-
- BOOST_TEST(x == 999);
+
+ BOOST_TEST(x == 999);
}
-
+
{
BOOST_TEST(
let(_a = 1, _b = 2, _c = 3, _d = 4, _e = 5)
@@ -111,7 +111,7 @@
() == 1 + 2 + 3 + 4 + 5
);
}
-
+
#ifdef PHOENIX_SHOULD_NOT_COMPILE_TEST
{
// disallow this:
@@ -119,7 +119,7 @@
(_a + _b)(i);
}
#endif
-
+
{
// show that we can return a local from an outer scope
int y = 0;
@@ -140,7 +140,7 @@
int& j = let(_a = arg1)[ _a ](i);
BOOST_TEST(&i == &j);
}
-
+
return boost::report_errors();
}
Modified: branches/proto/v4/libs/phoenix/test/statement/exceptions.cpp
==============================================================================
--- branches/proto/v4/libs/phoenix/test/statement/exceptions.cpp (original)
+++ branches/proto/v4/libs/phoenix/test/statement/exceptions.cpp 2008-05-12 02:59:01 EDT (Mon, 12 May 2008)
@@ -2,7 +2,7 @@
Copyright (c) 2005-2007 Dan Marsden
Copyright (c) 2005-2007 Joel de Guzman
- Distributed under the Boost Software License, Version 1.0. (See accompanying
+ Distributed under 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)
==============================================================================*/
Modified: branches/proto/v4/libs/phoenix/test/statement/if_tests.cpp
==============================================================================
--- branches/proto/v4/libs/phoenix/test/statement/if_tests.cpp (original)
+++ branches/proto/v4/libs/phoenix/test/statement/if_tests.cpp 2008-05-12 02:59:01 EDT (Mon, 12 May 2008)
@@ -1,7 +1,7 @@
/*=============================================================================
Copyright (c) 2001-2007 Joel de Guzman
- Distributed under the Boost Software License, Version 1.0. (See accompanying
+ Distributed under the Boost Software License, Version 1.0. (See accompanying
file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
==============================================================================*/
#include <iostream>
Modified: branches/proto/v4/libs/phoenix/test/statement/loops_tests.cpp
==============================================================================
--- branches/proto/v4/libs/phoenix/test/statement/loops_tests.cpp (original)
+++ branches/proto/v4/libs/phoenix/test/statement/loops_tests.cpp 2008-05-12 02:59:01 EDT (Mon, 12 May 2008)
@@ -1,7 +1,7 @@
/*=============================================================================
Copyright (c) 2001-2007 Joel de Guzman
- Distributed under the Boost Software License, Version 1.0. (See accompanying
+ Distributed under the Boost Software License, Version 1.0. (See accompanying
file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
==============================================================================*/
#include <iostream>
Modified: branches/proto/v4/libs/phoenix/test/statement/switch_tests.cpp
==============================================================================
--- branches/proto/v4/libs/phoenix/test/statement/switch_tests.cpp (original)
+++ branches/proto/v4/libs/phoenix/test/statement/switch_tests.cpp 2008-05-12 02:59:01 EDT (Mon, 12 May 2008)
@@ -1,7 +1,7 @@
/*=============================================================================
Copyright (c) 2001-2007 Joel de Guzman
- Distributed under the Boost Software License, Version 1.0. (See accompanying
+ Distributed under the Boost Software License, Version 1.0. (See accompanying
file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
==============================================================================*/
#include <iostream>
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk