Subject: [Boost-commit] svn:boost r56322 - in branches/release: . boost/algorithm/string boost/archive boost/fusion boost/graph boost/program_options boost/python boost/regex boost/serialization boost/signals boost/signals2 boost/spirit boost/system boost/wave libs/graph_parallel libs/mpl/doc/refmanual libs/mpl/doc/src/refmanual libs/program_options libs/proto/doc libs/python libs/regex libs/serialization libs/signals libs/signals2 libs/spirit libs/system libs/timer libs/wave status tools/build/v2 tools/regression tools/wave
From: eric_at_[hidden]
Date: 2009-09-20 11:17:13
Author: eric_niebler
Date: 2009-09-20 11:17:13 EDT (Sun, 20 Sep 2009)
New Revision: 56322
URL: http://svn.boost.org/trac/boost/changeset/56322
Log:
Merged revisions 56321 via svnmerge from
https://svn.boost.org/svn/boost/trunk
........
r56321 | eric_niebler | 2009-09-20 11:09:28 -0400 (Sun, 20 Sep 2009) | 1 line
const-qualify return type of pow() function
........
Properties modified:
branches/release/ (props changed)
branches/release/boost/algorithm/string/ (props changed)
branches/release/boost/archive/ (props changed)
branches/release/boost/fusion/ (props changed)
branches/release/boost/graph/ (props changed)
branches/release/boost/program_options/ (props changed)
branches/release/boost/python/ (props changed)
branches/release/boost/regex/ (props changed)
branches/release/boost/serialization/ (props changed)
branches/release/boost/signals/ (props changed)
branches/release/boost/signals2/ (props changed)
branches/release/boost/spirit/ (props changed)
branches/release/boost/system/ (props changed)
branches/release/boost/wave/ (props changed)
branches/release/libs/graph_parallel/ (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/program_options/ (props changed)
branches/release/libs/python/ (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/system/ (props changed)
branches/release/libs/timer/ (props changed)
branches/release/libs/wave/ (props changed)
branches/release/status/ (props changed)
branches/release/tools/build/v2/ (props changed)
branches/release/tools/regression/ (props changed)
branches/release/tools/wave/ (props changed)
Text files modified:
branches/release/libs/proto/doc/front_end.qbk | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
Modified: branches/release/libs/proto/doc/front_end.qbk
==============================================================================
--- branches/release/libs/proto/doc/front_end.qbk (original)
+++ branches/release/libs/proto/doc/front_end.qbk 2009-09-20 11:17:13 EDT (Sun, 20 Sep 2009)
@@ -169,7 +169,7 @@
typename proto::function<
typename proto::terminal<pow_fun<Exp> >::type
, Arg const &
- >::type
+ >::type const
pow(Arg const &arg)
{
typedef
@@ -214,7 +214,7 @@
typename proto::function<
typename proto::terminal<pow_fun<Exp> >::type
, Arg const & // <=== ERROR! This may not be a Proto type!
- >::type
+ >::type const
pow(Arg const &arg)
What we want is a way to make `Arg` into a Proto terminal if it is not a Proto expression already, and leave it alone if it is. For that, we can use _as_child_. The following implementation of the `pow()` function handles all argument types, expression templates or otherwise.
@@ -226,7 +226,7 @@
typename proto::function<
typename proto::terminal<pow_fun<Exp> >::type
, typename proto::result_of::as_child<Arg const>::type
- >::type
+ >::type const
pow(Arg const &arg)
{
typedef
@@ -255,7 +255,7 @@
proto::tag::function // Tag type
, pow_fun<Exp> // First child (by value)
, Arg const & // Second child (by reference)
- >::type
+ >::type const
pow(Arg const &arg)
{
return proto::make_expr<proto::tag::function>(