[Orxonox-commit 2462] r7169 - code/trunk/src/libraries/core
landauf at orxonox.net
landauf at orxonox.net
Tue Aug 17 01:13:52 CEST 2010
Author: landauf
Date: 2010-08-17 01:13:52 +0200 (Tue, 17 Aug 2010)
New Revision: 7169
Modified:
code/trunk/src/libraries/core/CorePrereqs.h
Log:
fixed an issue with boost 1.44.0
Modified: code/trunk/src/libraries/core/CorePrereqs.h
===================================================================
--- code/trunk/src/libraries/core/CorePrereqs.h 2010-08-16 21:26:05 UTC (rev 7168)
+++ code/trunk/src/libraries/core/CorePrereqs.h 2010-08-16 23:13:52 UTC (rev 7169)
@@ -36,6 +36,7 @@
#define _CorePrereqs_H__
#include "OrxonoxConfig.h"
+#include <boost/version.hpp>
//-----------------------------------------------------------------------
// Shared library settings
@@ -243,12 +244,27 @@
// Boost
namespace boost
{
+#if (BOOST_VERSION < 104400)
namespace filesystem
{
struct path_traits;
template <class String, class Traits> class basic_path;
typedef basic_path<std::string, path_traits> path;
}
+#else
+ namespace filesystem2
+ {
+ struct path_traits;
+ template <class String, class Traits> class basic_path;
+ typedef basic_path<std::string, path_traits> path;
+ }
+ namespace filesystem
+ {
+ using filesystem2::basic_path;
+ using filesystem2::path_traits;
+ using filesystem2::path;
+ }
+#endif
class thread;
class mutex;
class shared_mutex;
More information about the Orxonox-commit
mailing list