Commit Graph

1158 Commits

Author SHA1 Message Date
John Fletcher
db4d72259a one further change and preprocessed files. 2014-02-07 18:10:47 +00:00
John Fletcher
5adc3aba25 changes to correct shadow warnings 2014-02-07 17:53:31 +00:00
John Fletcher
db1f0eed55 Merge branch 'master' into develop 2014-02-07 12:54:51 +00:00
John Fletcher
ea1b13396f resolving merge 2014-02-07 12:40:56 +00:00
John Fletcher
ccdf75091f Sorting out merge of fix7624 2014-02-07 12:39:59 +00:00
John Fletcher
8649d54577 ChangeLog report on #9113 fixes 2014-02-07 12:29:04 +00:00
John Fletcher
c5bbcad14e Merge branch 'fix_9113' into develop 2014-02-07 12:19:53 +00:00
John Fletcher
ab4e3f5ef3 function_ptr preprocessed files 2014-02-07 11:59:31 +00:00
John Fletcher
c807d35997 phoenix/bind/detail/function_ptr.hpp Shadow fixes needs preprocessed files regenerated. 2014-02-07 11:51:30 +00:00
John Fletcher
62dbe3ecc0 preprocessed/mem_fun_ptr files 2014-02-07 11:43:48 +00:00
John Fletcher
effa7c21af boost/phoenix/bind/detail/function_ptr.hpp shadow fix 2014-02-07 11:43:08 +00:00
John Fletcher
f15f99cf86 boost/phoenix/statement/for.hpp fix shadow do_ 2014-02-07 11:33:01 +00:00
John Fletcher
d5f4332f73 boost/phoenix/operator/detail/mem_fun_ptr_gen.hpp Sort shadow. Needs preprocess regenerated. 2014-02-07 11:30:17 +00:00
John Fletcher
441603dbd8 boost/phoenix/scope/let.hpp fix shadow 2014-02-07 09:34:08 +00:00
John Fletcher
90da349e64 boost/phoenix/statement/do_while and while fix shadow do_ 2014-02-07 09:30:47 +00:00
John Fletcher
b795fd4a3e boost/phoenix/scoped/scoped_environment.hpp fix shadow vars 2014-02-07 09:25:14 +00:00
John Fletcher
51ab7c0e1c test/Jamfile Enable test bug7730 2014-02-07 08:13:55 +00:00
John Fletcher
28ebe1bf81 ChangeLog describe 7730 as fixed. 2014-02-06 23:45:32 +00:00
John Fletcher
2ab27c4bde Merge branch 'fix_7730' into develop 2014-02-06 23:34:37 +00:00
John Fletcher
ed312188a5 complete merge 2014-02-06 23:32:51 +00:00
John Fletcher
0ece7c7477 include/boost/phoenix/core/is_nullary.hpp value.hpp remove redundant code. 2014-02-06 23:17:56 +00:00
John Fletcher
e695ef051a include/boost/phoenix/core/is_nullary.hpp value.hpp Specialization here is wrong. 2014-02-06 20:11:15 +00:00
John Fletcher
5585da6ad1 include/boost/phoenix/scope/local_variable.hpp Take out local definition of is_nullary for case when BOOST_PHOENIX_NO_SPECIALISE_CUSTOM_TERMINAL is not defined. 2014-02-06 19:42:55 +00:00
John Fletcher
93a2c36edd test/include/core/bug7730.cpp Test all of phoenix with BOOST_PHOENIX_NO_SPECIALIZE_CUSTOM_TERMINAL defined 2014-02-06 19:41:29 +00:00
John Fletcher
5bc1ae31b7 include/boost/phoenix/core/is_nullary.hpp Local vars need setting of false_ 2014-02-06 17:45:18 +00:00
John Fletcher
05c9252eab file deleted 2014-02-06 17:44:24 +00:00
John Fletcher
86dc42f5e4 Merge branch 'release-3.0.4' 2014-02-05 20:56:03 +00:00
John Fletcher
64e9bf97a3 version.hpp resolve conflict 2014-02-05 20:54:41 +00:00
John Fletcher
c0dbf82384 include/boost/phoenix/version.hpp resolve conflict 2014-02-05 20:45:33 +00:00
John Fletcher
6a094019ee Amended to remove conflicts. 2014-02-05 20:35:40 +00:00
John Fletcher
7edf18a504 include/boost/phoenix/core/is_nullary.hpp Correct mistake 2014-02-05 20:19:35 +00:00
John Fletcher
1e884bb891 include/boost/phoenix/version.hpp Move version to 3.0.4 2014-02-05 20:16:15 +00:00
John Fletcher
e8bacacd1c include/boost/phoenix/core/is_nullary.hpp terminal.hpp Take #7730 fix out of use. 2014-02-05 20:14:36 +00:00
John Fletcher
d1f56f16cb ChangeLog Prepare to fork V3.0.4 2014-02-05 20:10:08 +00:00
John Fletcher
0bb05804ac test/include/scope further test changes. 2014-02-05 00:22:49 +00:00
John Fletcher
7b3b147066 include/boost/phoenix further experiments. 2014-02-05 00:22:27 +00:00
John Fletcher
922dead7e0 ChangeLog and test/Jamfile - withdraw bug7730 test 2014-02-04 23:46:53 +00:00
John Fletcher
1b7cb211a3 ChangeLog Move #7730 to work in progress - not fixed. 2014-02-04 23:40:20 +00:00
John Fletcher
59e8d2ddf5 test/include/various Tests to see what is working for #7730 2014-02-04 23:37:19 +00:00
John Fletcher
f346f296f4 include/boost/phoenix Various experiments to solve #7730 2014-02-04 23:36:48 +00:00
John Fletcher
ec5bb34475 test/include/core/bug7730.cpp switched test as well. 2014-02-04 21:18:18 +00:00
John Fletcher
e8832f1703 nclude/boost/phoenix/core/terminal.hpp swapped test to default on. 2014-02-04 21:17:33 +00:00
John Fletcher
9fe172886b include/boost/phoenix/core/is_nullary.hpp swapped test to default on. 2014-02-04 21:17:17 +00:00
John Fletcher
6960d6fd71 ChangeLog further clarification 2014-02-04 00:19:45 +00:00
John Fletcher
fb0467a0a8 Merge branch 'fix_7730' into develop 2014-02-04 00:03:05 +00:00
John Fletcher
a3c2761e84 ChangeLog Entry for #7730 2014-02-04 00:02:12 +00:00
John Fletcher
c073ca4533 test/Jamfile Add test bug7730 2014-02-03 23:58:52 +00:00
John Fletcher
56775d06b5 test/include/core/bug7730.cpp new test 2014-02-03 23:57:43 +00:00
John Fletcher
9293d138a3 include/boost/phoenix/core/terminal.hpp #7730 2014-02-03 23:57:17 +00:00
John Fletcher
a98bcc0f5d include/boost/phoenix/core/is_nullary.hpp #7730 2014-02-03 23:56:25 +00:00