Boost logo

Boost :

Subject: Re: [boost] [1.46] Last few merges needed?
From: John Maddock (boost.regex_at_[hidden])
Date: 2011-01-28 04:21:49


>> This conversation is all hunky dory, but I haven't seen an answer to the
>> original question yet - other than that docs changes are OK to merge....
>
> Sorry.. Wasn't totally following the start of the thread.. Now that I
> reread I'm still confused. What are *all* the changes that need to get
> merged?
>
> Scatterly-brain-hampered-ly yours ;-)

Me too ;-)

Here's the diff for the pathscale config, without it pathscale prior to v4
is completely broken:

--- ../branches/release/boost/config/select_compiler_config.hpp 2011-01-17
15:59
:34.498000000 +0000
+++ boost/config/select_compiler_config.hpp 2011-01-24
18:05:13.486000000 +0
000
@@ -52,7 +52,7 @@
 // Comeau C++
 # define BOOST_COMPILER_CONFIG "boost/config/compiler/comeau.hpp"

-#elif defined __PATHSCALE__
+#elif defined(__PATHSCALE__) && (__PATHCC__ >= 4)
 // PathScale EKOPath compiler (has to come before clang and gcc)
 # define BOOST_COMPILER_CONFIG "boost/config/compiler/pathscale.hpp"

Thanks, John.


Boost list run by bdawes at acm.org, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk