2
0
mirror of https://github.com/boostorg/phoenix.git synced 2026-02-20 02:52:08 +00:00
Commit Graph

289 Commits

Author SHA1 Message Date
Eric Niebler
d947768dfe Create first merge point for Git 2014-01-20 01:08:12 -08:00
Eric Niebler
ff75aae079 bring master into sync with develop for boost_bind_compatibility tests 2014-01-20 00:52:41 -08:00
Joel de Guzman
208ebabcf4 fixed typo
[SVN r73369]
2014-01-20 00:06:07 -08:00
Thomas Heller
cce266365f [phoenix] added fusion module to global include
[SVN r72702]

Conflicts:
	preprocess/wave.cfg
2014-01-19 23:41:25 -08:00
Joel de Guzman
4e19a1c485 added note to current and future maintainers to please make this as
lightweight as possible (as it is right now).

[SVN r78205]
2014-01-19 23:39:03 -08:00
Eric Niebler
7828c10367 bring develop and master in sync wrt include/boost/phoenix/bind/detail/member_variable.hpp 2014-01-19 23:37:37 -08:00
Stephen Kelly
9e6177fd2a Remove obsolete MSVC check from pragma guard
git grep -h -B1 "^#\s*pragma once" | grep -v pragma | sort | uniq

is now clean.

[SVN r85952]
2014-01-19 23:32:17 -08:00
K-ballo
322e4fdb3d Removed checks for v2 2014-01-19 23:31:24 -08:00
Thomas Heller
a93a65dcbf [phoenix]
- Fixed order of function specifiers

[SVN r71952]

Conflicts:
	include/boost/phoenix/operator/preprocessed/member_10.hpp
	include/boost/phoenix/operator/preprocessed/member_20.hpp
	include/boost/phoenix/operator/preprocessed/member_30.hpp
	include/boost/phoenix/operator/preprocessed/member_40.hpp
	include/boost/phoenix/operator/preprocessed/member_50.hpp
	include/boost/phoenix/scope/preprocessed/lambda_10.hpp
	include/boost/phoenix/scope/preprocessed/lambda_20.hpp
	include/boost/phoenix/scope/preprocessed/lambda_30.hpp
	include/boost/phoenix/scope/preprocessed/lambda_40.hpp
	include/boost/phoenix/scope/preprocessed/lambda_50.hpp
2014-01-19 23:30:17 -08:00
Thomas Heller
4be75f5589 Boost.Phoenix:
- Adding boost::phoenix::expression::function, aliasing
      boost::phoenix::detail::expression::function_eval, this makes the example
      compile again

[SVN r79223]
2014-01-19 23:12:47 -08:00
Eric Niebler
11e5bf32c0 update Phoenix preprocess for modularization 2014-01-19 22:55:17 -08:00
Eric Niebler
8e473f2d26 merge [85488] from trunk, fixes #9049
[SVN r85550]
2013-09-03 17:47:12 +00:00
Eric Niebler
ef473de7bb phoenix::function constructor is constexpr, refs #9049
[SVN r85488]
2013-08-27 16:43:00 +00:00
Eric Niebler
a1cf2d1194 phoenix: merge [80804] from trunk
[SVN r80805]
2012-10-01 07:25:11 +00:00
Eric Niebler
8de23029bc avoid msvc-9.0 adl bug by qualifying calls
[SVN r80804]
2012-10-01 07:23:12 +00:00
Eric Niebler
29a96a77ee phoenix: merge [80758] [80764] from trunk
[SVN r80802]
2012-10-01 02:06:52 +00:00
Eric Niebler
8c03db9e38 fix more phoenix decltype-result_of bugs
[SVN r80758]
2012-09-29 16:55:08 +00:00
Eric Niebler
4da68d2b04 phoenix: merge [80729], [80730], [80733], [80734] from trunk
[SVN r80748]
2012-09-28 23:08:17 +00:00
Eric Niebler
e38e75b2ef add missing includes
[SVN r80734]
2012-09-28 09:04:25 +00:00
Eric Niebler
f19fb96248 fix a great many decltype result_of bugs. more remain
[SVN r80733]
2012-09-28 08:52:33 +00:00
Eric Niebler
bc1f0a9ca1 don't use proto::detail::pass_through_impl directly
[SVN r80730]
2012-09-28 03:50:54 +00:00
Eric Niebler
343725c457 jamfile and wave.cfg tweaks for easier and better phoenix preprocessing
[SVN r80729]
2012-09-28 03:48:41 +00:00
Eric Niebler
ae35289151 phoenix: merge [80364] from trunk
[SVN r80726]
2012-09-27 17:54:01 +00:00
Hartmut Kaiser
a36067b60e Phoenix: updating for recent changes to Proto
[SVN r80364]
2012-09-02 17:06:04 +00:00
Eric Niebler
c0cbb95d46 merge [79632], [79640], [79678], [79686], [79711], [79713], [79725], [79742], [79920] from trunk
[SVN r80297]
2012-08-29 02:40:56 +00:00
Eric Niebler
27777dc396 qualify calls to phoenix::env to avoid name lookup clashes with proto::env on gcc
[SVN r79640]
2012-07-21 16:19:07 +00:00
Eric Niebler
998d4f97bb add support for transform environment with slots for key/value pairs
[SVN r79632]
2012-07-21 05:50:50 +00:00
Thomas Heller
d29cb5621f Boost.Phoenix:
- Adding boost::phoenix::expression::function, aliasing
      boost::phoenix::detail::expression::function_eval, this makes the example
      compile again



[SVN r79223]
2012-07-02 06:26:27 +00:00
Joel de Guzman
683f27ed0e added note to current and future maintainers to please make this as
lightweight as possible (as it is right now).

[SVN r78205]
2012-04-26 06:26:10 +00:00
Hartmut Kaiser
4ae3fe7b14 Phoenix: merging changes from trunk (as requested by heller)
[SVN r76496]
2012-01-14 20:18:36 +00:00
Hartmut Kaiser
5cb684a1cf Phoenix: fixed #6360: Patch for "begin/end ambiguity"
[SVN r76495]
2012-01-14 20:16:12 +00:00
Joel de Guzman
9c769c3ee9 fixes for comments from Dave Abrahams.
[SVN r75778]
2011-12-03 06:07:06 +00:00
Thomas Heller
7d976b6f41 [phoenix]
- some cosmetic changes
    - fixing bug #6040



[SVN r75069]
2011-10-20 13:41:39 +00:00
Thomas Heller
55986293cc reverting experimental change
[SVN r75051]
2011-10-18 17:11:04 +00:00
Thomas Heller
0b27404ee2 added full qualification to enable_if for the member pointer operator
[SVN r75050]
2011-10-18 16:09:48 +00:00
Daniel James
74e0ba7202 Merge redirect for spirit/phoenix docs.
Should be replaced by the generated docs in the snapshot. I'll check that it
worked tomorrow.



[SVN r75014]
2011-10-17 20:12:11 +00:00
Daniel James
9ba0e02620 Replace spirit and phoenix documentation with a redirect.
[SVN r74983]
2011-10-16 18:53:01 +00:00
Thomas Heller
2d29c3e624 Phoenix: Merged [72812], [72815], [73000], [73041], [74041], [74830], [74833], [74839] from trunk
[SVN r74904]
2011-10-10 23:25:34 +00:00
Thomas Heller
ef3832291d Fixing bug #5968 for msvc
[SVN r74839]
2011-10-09 03:27:33 +00:00
Thomas Heller
4e64b8eb1f - Forgot some changes for bug #5920
- Added testcase for bug #5968, works on gcc 4.6



[SVN r74833]
2011-10-09 00:55:08 +00:00
Thomas Heller
dedcc7527f Fixing bug #5920
[SVN r74830]
2011-10-09 00:40:20 +00:00
Thomas Heller
ab1a6a2c3c [phoenix]
Fixing bug #5782



[SVN r74041]
2011-08-24 09:52:58 +00:00
Joel de Guzman
25b8dadf70 fixed typo
[SVN r73369]
2011-07-26 01:51:38 +00:00
Thomas Heller
d1cf1c54f3 [phoenix]
- Fixing Bug #5687




[SVN r73041]
2011-07-13 07:24:29 +00:00
Thomas Heller
f7a71a04cf [phoenix]
- Fixed bug #5683




[SVN r73000]
2011-07-11 10:03:15 +00:00
Thomas Heller
6975ff46c1 [phoenix] missed one expression not compliant with MSVC 7.1
[SVN r72815]
2011-06-30 11:45:39 +00:00
Thomas Heller
48681c0844 [phoenix] next try to fix MSVC 7.1 hickups
[SVN r72812]
2011-06-30 08:02:11 +00:00
Thomas Heller
6daea07aaa Merged revision r72794
Authorized by Beman



[SVN r72796]
2011-06-29 15:47:53 +00:00
Thomas Heller
293fa5c237 [phoenix] Fixed bug #5626: corrected return value computation
[SVN r72794]
2011-06-29 14:16:58 +00:00
Thomas Heller
d75439f630 [phoenix] added fusion module to global include
[SVN r72702]
2011-06-21 11:42:50 +00:00