Subject: [boost] [1.46] Last few merges needed?
From: John Maddock (boost.regex_at_[hidden])
Date: 2011-01-27 07:24:39
I've been sifting through what needs to change on the release branch (for
1.46) in Boost.Config to revert some of the changes made by Bryce which have
already been reverted in Trunk.
The patches to the pathscale config need to be merged to Release
(unfortunately it took until now to get these working on Trunk):
--- boost/config/select_compiler_config.hpp 2011-01-24
+++ ../branches/release/boost/config/select_compiler_config.hpp 2011-01-17
@@ -52,7 +52,7 @@
// Comeau C++
# define BOOST_COMPILER_CONFIG "boost/config/compiler/comeau.hpp"
-#elif defined(__PATHSCALE__) && (__PATHCC__ >= 4)
+#elif defined __PATHSCALE__
// PathScale EKOPath compiler (has to come before clang and gcc)
# define BOOST_COMPILER_CONFIG "boost/config/compiler/pathscale.hpp"
And also the Boost.Config docs need to be merged to release so that the new
BOOST_*_NIX macros that were added and then removed are no longer documented
in 1.46 (the actual changed headers can wait till 1.47 for merging).
Is there likely to be a window when these changes can be merged - maybe
between beta and release?
Also are there any other pending reverts in Trunk but not release?