|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r63140 - in branches/release: . boost boost/algorithm/string boost/archive boost/bimap boost/config boost/detail boost/filesystem boost/functional/hash boost/fusion boost/gil boost/graph boost/integer boost/interprocess boost/intrusive boost/iostreams boost/math boost/numeric/ublas boost/program_options boost/property_tree boost/proto boost/proto/detail boost/python boost/range boost/regex boost/serialization boost/signals boost/signals2 boost/spirit boost/spirit/home boost/spirit/home/karma boost/spirit/home/support boost/statechart boost/system boost/thread boost/tr1 boost/type_traits boost/unordered boost/utility boost/uuid boost/variant boost/wave doc libs libs/array/doc libs/array/test libs/bimap libs/config libs/filesystem libs/functional/hash libs/fusion libs/graph_parallel libs/integer libs/interprocess libs/intrusive libs/iostreams libs/math libs/mpl/doc/refmanual libs/mpl/doc/src/refmanual libs/numeric/ublas libs/numeric/ublas/doc libs/program_options libs/property_tree libs/proto/doc libs/proto/doc/reference libs/proto/doc/reference/transform libs/proto/example libs/python libs/range libs/range/doc libs/regex libs/serialization libs/signals libs/signals2 libs/spirit libs/spirit/classic/example libs/spirit/doc libs/spirit/example libs/spirit/phoenix libs/spirit/test libs/spirit/test/qi libs/statechart libs/static_assert libs/system libs/thread libs/timer libs/tr1 libs/type_traits libs/unordered libs/utility libs/utility/swap/test libs/uuid libs/wave more more/getting_started people status tools tools/bcp tools/boostbook tools/build/v2 tools/build/v2/tools tools/inspect tools/jam tools/quickbook tools/regression tools/release tools/wave wiki
From: eric_at_[hidden]
Date: 2010-06-20 11:04:35
Author: eric_niebler
Date: 2010-06-20 11:04:34 EDT (Sun, 20 Jun 2010)
New Revision: 63140
URL: http://svn.boost.org/trac/boost/changeset/63140
Log:
Merged revisions 63021,63037,63091 via svnmerge from
https://svn.boost.org/svn/boost/trunk
........
r63021 | eric_niebler | 2010-06-16 10:32:07 -0400 (Wed, 16 Jun 2010) | 1 line
remove docs for base_expr
........
r63037 | eric_niebler | 2010-06-17 00:15:40 -0400 (Thu, 17 Jun 2010) | 1 line
final(?) tweak to description of domain deduction
........
r63091 | eric_niebler | 2010-06-18 23:32:55 -0400 (Fri, 18 Jun 2010) | 1 line
work-arounds for msvc-7.1
........
Properties modified:
branches/release/ (props changed)
branches/release/INSTALL (props changed)
branches/release/Jamroot (props changed)
branches/release/LICENSE_1_0.txt (props changed)
branches/release/boost/ (props changed)
branches/release/boost-build.jam (props changed)
branches/release/boost.css (props changed)
branches/release/boost.png (props changed)
branches/release/boost/algorithm/string/ (props changed)
branches/release/boost/archive/ (props changed)
branches/release/boost/array.hpp (props changed)
branches/release/boost/bimap/ (props changed)
branches/release/boost/config/ (props changed)
branches/release/boost/config.hpp (props changed)
branches/release/boost/detail/ (props changed)
branches/release/boost/detail/endian.hpp (props changed)
branches/release/boost/filesystem/ (props changed)
branches/release/boost/functional/hash/ (props changed)
branches/release/boost/fusion/ (props changed)
branches/release/boost/gil/ (props changed)
branches/release/boost/graph/ (props changed)
branches/release/boost/integer/ (props changed)
branches/release/boost/interprocess/ (props changed)
branches/release/boost/intrusive/ (props changed)
branches/release/boost/iostreams/ (props changed)
branches/release/boost/math/ (props changed)
branches/release/boost/numeric/ublas/ (props changed)
branches/release/boost/program_options/ (props changed)
branches/release/boost/property_tree/ (props changed)
branches/release/boost/python/ (props changed)
branches/release/boost/range/ (props changed)
branches/release/boost/regex/ (props changed)
branches/release/boost/serialization/ (props changed)
branches/release/boost/serialization/factory.hpp (props changed)
branches/release/boost/signals/ (props changed)
branches/release/boost/signals2/ (props changed)
branches/release/boost/spirit/ (props changed)
branches/release/boost/spirit/home/ (props changed)
branches/release/boost/spirit/home/karma/ (props changed)
branches/release/boost/spirit/home/support/attributes.hpp (props changed)
branches/release/boost/statechart/ (props changed)
branches/release/boost/system/ (props changed)
branches/release/boost/thread/ (props changed)
branches/release/boost/thread.hpp (props changed)
branches/release/boost/tr1/ (props changed)
branches/release/boost/type_traits/ (props changed)
branches/release/boost/unordered/ (props changed)
branches/release/boost/utility/ (props changed)
branches/release/boost/utility/value_init.hpp (props changed)
branches/release/boost/uuid/ (props changed)
branches/release/boost/variant/ (props changed)
branches/release/boost/version.hpp (props changed)
branches/release/boost/wave/ (props changed)
branches/release/bootstrap.bat (props changed)
branches/release/bootstrap.sh (props changed)
branches/release/doc/ (props changed)
branches/release/index.htm (props changed)
branches/release/index.html (props changed)
branches/release/libs/ (props changed)
branches/release/libs/array/doc/array.xml (props changed)
branches/release/libs/array/test/array0.cpp (props changed)
branches/release/libs/bimap/ (props changed)
branches/release/libs/config/ (props changed)
branches/release/libs/filesystem/ (props changed)
branches/release/libs/functional/hash/ (props changed)
branches/release/libs/fusion/ (props changed)
branches/release/libs/graph_parallel/ (props changed)
branches/release/libs/integer/ (props changed)
branches/release/libs/interprocess/ (props changed)
branches/release/libs/intrusive/ (props changed)
branches/release/libs/iostreams/ (props changed)
branches/release/libs/libraries.htm (props changed)
branches/release/libs/maintainers.txt (props changed)
branches/release/libs/math/ (props changed)
branches/release/libs/mpl/doc/refmanual/broken-compiler-workarounds.html (props changed)
branches/release/libs/mpl/doc/refmanual/categorized-index-concepts.html (props changed)
branches/release/libs/mpl/doc/refmanual/cfg-no-preprocessed-headers.html (props changed)
branches/release/libs/mpl/doc/refmanual/composition-and-argument-binding.html (props changed)
branches/release/libs/mpl/doc/refmanual/data-types-concepts.html (props changed)
branches/release/libs/mpl/doc/refmanual/data-types-miscellaneous.html (props changed)
branches/release/libs/mpl/doc/refmanual/extensible-associative-sequence.html (props changed)
branches/release/libs/mpl/doc/refmanual/inserter-class.html (props changed)
branches/release/libs/mpl/doc/refmanual/tag-dispatched-metafunction.html (props changed)
branches/release/libs/mpl/doc/refmanual/trivial-metafunctions-summary.html (props changed)
branches/release/libs/mpl/doc/src/refmanual/Iterators-Iterator.rst (props changed)
branches/release/libs/numeric/ublas/ (props changed)
branches/release/libs/numeric/ublas/doc/ (props changed)
branches/release/libs/program_options/ (props changed)
branches/release/libs/property_tree/ (props changed)
branches/release/libs/python/ (props changed)
branches/release/libs/range/ (props changed)
branches/release/libs/range/doc/ (props changed)
branches/release/libs/regex/ (props changed)
branches/release/libs/serialization/ (props changed)
branches/release/libs/signals/ (props changed)
branches/release/libs/signals2/ (props changed)
branches/release/libs/spirit/ (props changed)
branches/release/libs/spirit/classic/example/ (props changed)
branches/release/libs/spirit/doc/ (props changed)
branches/release/libs/spirit/example/ (props changed)
branches/release/libs/spirit/phoenix/ (props changed)
branches/release/libs/spirit/test/ (props changed)
branches/release/libs/spirit/test/qi/optional.cpp (props changed)
branches/release/libs/statechart/ (props changed)
branches/release/libs/static_assert/ (props changed)
branches/release/libs/system/ (props changed)
branches/release/libs/thread/ (props changed)
branches/release/libs/timer/ (props changed)
branches/release/libs/tr1/ (props changed)
branches/release/libs/type_traits/ (props changed)
branches/release/libs/unordered/ (props changed)
branches/release/libs/utility/ (props changed)
branches/release/libs/utility/swap.html (props changed)
branches/release/libs/utility/swap/test/std_bitset.cpp (props changed)
branches/release/libs/utility/value_init.htm (props changed)
branches/release/libs/utility/value_init_test.cpp (props changed)
branches/release/libs/uuid/ (props changed)
branches/release/libs/wave/ (props changed)
branches/release/more/ (props changed)
branches/release/more/getting_started/ (props changed)
branches/release/people/ (props changed)
branches/release/rst.css (props changed)
branches/release/status/ (props changed)
branches/release/status/Jamfile.v2 (props changed)
branches/release/tools/ (props changed)
branches/release/tools/bcp/ (props changed)
branches/release/tools/boostbook/ (props changed)
branches/release/tools/build/v2/ (props changed)
branches/release/tools/build/v2/tools/ (props changed)
branches/release/tools/inspect/ (props changed)
branches/release/tools/jam/ (props changed)
branches/release/tools/quickbook/ (props changed)
branches/release/tools/regression/ (props changed)
branches/release/tools/release/ (props changed)
branches/release/tools/wave/ (props changed)
branches/release/wiki/ (props changed)
Text files modified:
branches/release/boost/proto/detail/as_expr.hpp | 30 ++++++++++++++++++++++++++----
branches/release/boost/proto/domain.hpp | 4 ++--
branches/release/boost/proto/proto_fwd.hpp | 2 +-
branches/release/libs/proto/doc/reference.xml | 4 ++--
branches/release/libs/proto/doc/reference/domain.xml | 21 ++++++++++++---------
branches/release/libs/proto/doc/reference/transform/pass_through.xml | 18 +++++++++++++++++-
branches/release/libs/proto/example/futures.cpp | 13 +++++++++++--
branches/release/libs/proto/example/map_assign.cpp | 11 +++++++++++
8 files changed, 82 insertions(+), 21 deletions(-)
Modified: branches/release/boost/proto/detail/as_expr.hpp
==============================================================================
--- branches/release/boost/proto/detail/as_expr.hpp (original)
+++ branches/release/boost/proto/detail/as_expr.hpp 2010-06-20 11:04:34 EDT (Sun, 20 Jun 2010)
@@ -11,6 +11,8 @@
#ifndef BOOST_PROTO_DETAIL_AS_EXPR_HPP_EAN_06_09_2010
#define BOOST_PROTO_DETAIL_AS_EXPR_HPP_EAN_06_09_2010
+#include <boost/config.hpp>
+#include <boost/detail/workaround.hpp>
#include <boost/type_traits/remove_const.hpp>
#include <boost/proto/proto_fwd.hpp>
#include <boost/proto/args.hpp>
@@ -97,7 +99,12 @@
template<typename T, typename Generator>
struct as_child<T, Generator, false>
{
- typedef proto::expr<proto::tag::terminal, term<T &>, 0> expr_type;
+ #if BOOST_WORKAROUND(BOOST_MSVC, == 1310)
+ typedef typename term_traits<T &>::reference reference;
+ #else
+ typedef T &reference;
+ #endif
+ typedef proto::expr<proto::tag::terminal, term<reference>, 0> expr_type;
typedef typename Generator::template result<Generator(expr_type)>::type result_type;
result_type operator()(T &t) const
@@ -110,7 +117,12 @@
template<typename T, typename Generator>
struct as_child<T, Generator, true>
{
- typedef proto::basic_expr<proto::tag::terminal, term<T &>, 0> expr_type;
+ #if BOOST_WORKAROUND(BOOST_MSVC, == 1310)
+ typedef typename term_traits<T &>::reference reference;
+ #else
+ typedef T &reference;
+ #endif
+ typedef proto::basic_expr<proto::tag::terminal, term<reference>, 0> expr_type;
typedef typename Generator::template result<Generator(expr_type)>::type result_type;
result_type operator()(T &t) const
@@ -123,7 +135,12 @@
template<typename T>
struct as_child<T, proto::default_generator, false>
{
- typedef proto::expr<proto::tag::terminal, term<T &>, 0> result_type;
+ #if BOOST_WORKAROUND(BOOST_MSVC, == 1310)
+ typedef typename term_traits<T &>::reference reference;
+ #else
+ typedef T &reference;
+ #endif
+ typedef proto::expr<proto::tag::terminal, term<reference>, 0> result_type;
result_type operator()(T &t) const
{
@@ -135,7 +152,12 @@
template<typename T>
struct as_child<T, proto::default_generator, true>
{
- typedef proto::basic_expr<proto::tag::terminal, term<T &>, 0> result_type;
+ #if BOOST_WORKAROUND(BOOST_MSVC, == 1310)
+ typedef typename term_traits<T &>::reference reference;
+ #else
+ typedef T &reference;
+ #endif
+ typedef proto::basic_expr<proto::tag::terminal, term<reference>, 0> result_type;
result_type operator()(T &t) const
{
Modified: branches/release/boost/proto/domain.hpp
==============================================================================
--- branches/release/boost/proto/domain.hpp (original)
+++ branches/release/boost/proto/domain.hpp 2010-06-20 11:04:34 EDT (Sun, 20 Jun 2010)
@@ -216,7 +216,7 @@
/// either an instance of \c proto::expr\<\> or
/// \c proto::basic_expr\<\>.
///
- template<typename Domain, typename Tag, typename Args, typename Void /*= void*/>
+ template<typename Domain, typename Tag, typename Args, bool WantsBasicExpr>
struct base_expr
{
typedef proto::expr<Tag, Args, Args::arity> type;
@@ -225,7 +225,7 @@
/// INTERNAL ONLY
///
template<typename Domain, typename Tag, typename Args>
- struct base_expr<Domain, Tag, Args, typename Domain::proto_generator::proto_use_basic_expr_>
+ struct base_expr<Domain, Tag, Args, true>
{
typedef proto::basic_expr<Tag, Args, Args::arity> type;
};
Modified: branches/release/boost/proto/proto_fwd.hpp
==============================================================================
--- branches/release/boost/proto/proto_fwd.hpp (original)
+++ branches/release/boost/proto/proto_fwd.hpp 2010-06-20 11:04:34 EDT (Sun, 20 Jun 2010)
@@ -278,7 +278,7 @@
struct deduce_domain;
- template<typename Domain, typename Tag, typename Args, typename Void = void>
+ template<typename Domain, typename Tag, typename Args, bool WantsBasicExpr = wants_basic_expr<typename Domain::proto_generator>::value>
struct base_expr;
}
Modified: branches/release/libs/proto/doc/reference.xml
==============================================================================
--- branches/release/libs/proto/doc/reference.xml (original)
+++ branches/release/libs/proto/doc/reference.xml 2010-06-20 11:04:34 EDT (Sun, 20 Jun 2010)
@@ -75,11 +75,11 @@
<classname alt="boost::proto::assign">proto::assign</classname>
</computeroutput>
</listitem>
- <listitem>
+ <!--<listitem>
<computeroutput>
<classname alt="boost::proto::base_expr">proto::base_expr</classname>
</computeroutput>
- </listitem>
+ </listitem>-->
<listitem>
<computeroutput>
<classname alt="boost::proto::basic_expr">proto::basic_expr</classname>
Modified: branches/release/libs/proto/doc/reference/domain.xml
==============================================================================
--- branches/release/libs/proto/doc/reference/domain.xml (original)
+++ branches/release/libs/proto/doc/reference/domain.xml 2010-06-20 11:04:34 EDT (Sun, 20 Jun 2010)
@@ -264,26 +264,29 @@
that includes the child's domain and all its super-domains.
</listitem>
<listitem>
- Define a set <emphasis>I</emphasis> that is the intersection of all the individual sets
- <emphasis>S<subscript>N</subscript></emphasis>.
+ Define a set <emphasis>I<subscript>S</subscript></emphasis> that is the intersection of
+ all the individual sets <emphasis>S<subscript>N</subscript></emphasis> that don't contain
+ <computeroutput><classname>proto::default_domain</classname></computeroutput>.
</listitem>
<listitem>
- Define a set <emphasis>I<subscript>D</subscript></emphasis> that is the intersection of
+ Define a set <emphasis>I<subscript>W</subscript></emphasis> that is the intersection of
all the individual sets <emphasis>S<subscript>N</subscript></emphasis> that contain
<computeroutput><classname>proto::default_domain</classname></computeroutput>.
</listitem>
<listitem>
- Define a set <emphasis>P</emphasis> that is the union of <emphasis>I</emphasis>
- and <emphasis>I<subscript>D</subscript></emphasis>.
+ Define a set <emphasis>P</emphasis> that is the union of
+ <emphasis>I<subscript>S</subscript></emphasis> and
+ <emphasis>I<subscript>W</subscript></emphasis>.
</listitem>
<listitem>
The common domain is the strongest domain in set <emphasis>P</emphasis>, with the
following caveat.
</listitem>
<listitem>
- If the result is
+ Let <emphasis>U</emphasis> be the union of all sets
+ <emphasis>S<subscript>N</subscript></emphasis>. If the result is
<computeroutput><classname>proto::default_domain</classname></computeroutput>
- and <emphasis>P</emphasis> contains an element that is <emphasis>not </emphasis>
+ and <emphasis>U</emphasis> contains an element that is <emphasis>not </emphasis>
<computeroutput><classname>proto::default_domain</classname></computeroutput>,
it is an error.
</listitem>
@@ -332,7 +335,7 @@
</typedef>
</struct>
- <!-- proto::base_expr -->
+ <!-- proto::base_expr --><!--
<struct name="base_expr">
<template>
<template-type-parameter name="Domain"/>
@@ -359,7 +362,7 @@
<typedef name="type">
<type>typename mpl::if_<<classname>proto::wants_basic_expr</classname>< Domain >, A, B>::type</type>
</typedef>
- </struct>
+ </struct>-->
</namespace>
</namespace>
Modified: branches/release/libs/proto/doc/reference/transform/pass_through.xml
==============================================================================
--- branches/release/libs/proto/doc/reference/transform/pass_through.xml (original)
+++ branches/release/libs/proto/doc/reference/transform/pass_through.xml 2010-06-20 11:04:34 EDT (Sun, 20 Jun 2010)
@@ -104,9 +104,25 @@
<purpose>For exposition only</purpose>
<type>typename Expr::proto_domain</type>
</typedef>
+ <typedef name="G">
+ <purpose>For exposition only</purpose>
+ <type>typename D::proto_generator</type>
+ </typedef>
+ <typedef name="A">
+ <purpose>For exposition only</purpose>
+ <type><classname>proto::listN</classname><R0,...RN></type>
+ </typedef>
+ <typedef name="E">
+ <purpose>For exposition only</purpose>
+ <type><classname>proto::expr</classname><T, A></type>
+ </typedef>
+ <typedef name="BE">
+ <purpose>For exposition only</purpose>
+ <type><classname>proto::basic_expr</classname><T, A></type>
+ </typedef>
<typedef name="expr_type">
<purpose>For exposition only</purpose>
- <type>typename <classname>proto::base_expr</classname><D, T, <classname>proto::listN</classname><R0,...RN> >::type</type>
+ <type>typename mpl::if_<<classname>proto::wants_basic_expr</classname><G>, BE, E>::type</type>
</typedef>
<typedef name="result_type">
<type>typename boost::result_of<D(expr_type)>::type</type>
Modified: branches/release/libs/proto/example/futures.cpp
==============================================================================
--- branches/release/libs/proto/example/futures.cpp (original)
+++ branches/release/libs/proto/example/futures.cpp 2010-06-20 11:04:34 EDT (Sun, 20 Jun 2010)
@@ -24,6 +24,11 @@
typedef L type;
};
+// Work-arounds for Microsoft Visual C++ 7.1
+#if BOOST_WORKAROUND(BOOST_MSVC, == 1310)
+#define FutureGroup(x) proto::call<FutureGroup(x)>
+#endif
+
// Define the grammar of future group expression, as well as a
// transform to turn them into a Fusion sequence of the correct
// type.
@@ -39,8 +44,8 @@
, proto::when<
proto::logical_and<FutureGroup, FutureGroup>
, fusion::joint_view<
- boost::add_const<FutureGroup(proto::_left)>
- , boost::add_const<FutureGroup(proto::_right)>
+ boost::add_const<FutureGroup(proto::_left) >
+ , boost::add_const<FutureGroup(proto::_right) >
>(FutureGroup(proto::_left), FutureGroup(proto::_right))
>
// (a || b) becomes the sequence for 'a', so long
@@ -55,6 +60,10 @@
>
{};
+#if BOOST_WORKAROUND(BOOST_MSVC, == 1310)
+#undef FutureGroup
+#endif
+
template<class E>
struct future_expr;
Modified: branches/release/libs/proto/example/map_assign.cpp
==============================================================================
--- branches/release/libs/proto/example/map_assign.cpp (original)
+++ branches/release/libs/proto/example/map_assign.cpp 2010-06-20 11:04:34 EDT (Sun, 20 Jun 2010)
@@ -40,6 +40,12 @@
}
};
+// Work-arounds for Microsoft Visual C++ 7.1
+#if BOOST_WORKAROUND(BOOST_MSVC, == 1310)
+#define MapListOf(x) proto::call<MapListOf(x)>
+#define _value(x) call<proto::_value(x)>
+#endif
+
// The grammar for valid map-list expressions, and a
// transform that populates the map.
struct MapListOf
@@ -71,6 +77,11 @@
>
{};
+#if BOOST_WORKAROUND(BOOST_MSVC, == 1310)
+#undef MapListOf
+#undef _value
+#endif
+
template<typename Expr>
struct map_list_of_expr;
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