Subject: [Boost-commit] svn:boost r49171 - in branches/bcbboost: boost/config/compiler libs/serialization/vc7ide tools/bcp
From: nicola.musatti_at_[hidden]
Date: 2008-10-07 17:11:26
Author: nmusatti
Date: 2008-10-07 17:11:25 EDT (Tue, 07 Oct 2008)
New Revision: 49171
URL: http://svn.boost.org/trac/boost/changeset/49171
Log:
Merge from trunk
Text files modified:
branches/bcbboost/boost/config/compiler/sunpro_cc.hpp | 4 ++++
branches/bcbboost/libs/serialization/vc7ide/Library.vcproj | 3 +++
branches/bcbboost/tools/bcp/bcp_imp.cpp | 10 +++++++++-
branches/bcbboost/tools/bcp/main.cpp | 19 +++++++++++++++----
4 files changed, 31 insertions(+), 5 deletions(-)
Modified: branches/bcbboost/boost/config/compiler/sunpro_cc.hpp
==============================================================================
--- branches/bcbboost/boost/config/compiler/sunpro_cc.hpp (original)
+++ branches/bcbboost/boost/config/compiler/sunpro_cc.hpp 2008-10-07 17:11:25 EDT (Tue, 07 Oct 2008)
@@ -75,6 +75,10 @@
#define BOOST_NO_TWO_PHASE_NAME_LOOKUP
#define BOOST_NO_ADL_BARRIER
+#if(__SUNPRO_CC >= 0x590)
+# define BOOST_HAS_LONG_LONG
+#endif
+
#define BOOST_COMPILER "Sun compiler version " BOOST_STRINGIZE(__SUNPRO_CC)
Modified: branches/bcbboost/libs/serialization/vc7ide/Library.vcproj
==============================================================================
--- branches/bcbboost/libs/serialization/vc7ide/Library.vcproj (original)
+++ branches/bcbboost/libs/serialization/vc7ide/Library.vcproj 2008-10-07 17:11:25 EDT (Tue, 07 Oct 2008)
@@ -692,6 +692,9 @@
RelativePath="..\..\..\boost\serialization\state_saver.hpp">
</File>
<File
+ RelativePath="..\..\..\boost\serialization\static_warning.hpp">
+ </File>
+ <File
RelativePath="..\..\..\boost\serialization\strong_typedef.hpp">
</File>
<File
Modified: branches/bcbboost/tools/bcp/bcp_imp.cpp
==============================================================================
--- branches/bcbboost/tools/bcp/bcp_imp.cpp (original)
+++ branches/bcbboost/tools/bcp/bcp_imp.cpp 2008-10-07 17:11:25 EDT (Tue, 07 Oct 2008)
@@ -78,7 +78,8 @@
void bcp_implementation::set_boost_path(const char* p)
{
- m_boost_path = fs::path(p, fs::native);
+ // Hack to strip trailing slashes from the path
+ m_boost_path = (fs::path(p, fs::native) / "boost").parent_path();
fs::path check = m_boost_path / "boost" / "version.hpp";
if(!fs::exists(check))
{
@@ -125,6 +126,13 @@
std::runtime_error e(msg);
boost::throw_exception(e);
}
+ //
+ // Check Boost path is OK if it hasn't been checked already:
+ //
+ if(m_boost_path == "")
+ {
+ set_boost_path("");
+ }
// start by building a list of permitted files
// if m_cvs_mode is true:
if(m_cvs_mode)
Modified: branches/bcbboost/tools/bcp/main.cpp
==============================================================================
--- branches/bcbboost/tools/bcp/main.cpp (original)
+++ branches/bcbboost/tools/bcp/main.cpp 2008-10-07 17:11:25 EDT (Tue, 07 Oct 2008)
@@ -11,6 +11,8 @@
#include <iostream>
#include <cstring>
+#include <string>
+#include <list>
#include <boost/filesystem/path.hpp>
#include <boost/version.hpp>
#include "bcp.hpp"
@@ -74,6 +76,7 @@
// object what ir needs to do:
//
bool list_mode = false;
+ std::list<const char*> positional_args;
for(int i = 1; i < argc; ++i)
{
if(0 == std::strcmp("-h", argv[i])
@@ -138,13 +141,21 @@
}
else
{
- if(!list_mode && (i == argc - 1))
- papp->set_destination(argv[i]);
- else
- papp->add_module(argv[i]);
+ positional_args.push_back(argv[i]);
}
}
//
+ // Handle positional args last:
+ //
+ for(std::list<const char*>::const_iterator i = positional_args.begin();
+ i != positional_args.end(); ++i)
+ {
+ if(!list_mode && (i == --positional_args.end()))
+ papp->set_destination(*i);
+ else
+ papp->add_module(*i);
+ }
+ //
// run the application object:
//
return papp->run();