summaryrefslogtreecommitdiff
path: root/src/boosty.h
diff options
context:
space:
mode:
authorDon Bright <hugh.m.bright@gmail.com>2012-01-14 20:14:26 (GMT)
committerDon Bright <hugh.m.bright@gmail.com>2012-01-14 20:14:26 (GMT)
commit864c39f5fbb8002f4634b76a03a174da0d5b02da (patch)
tree3e54e40e6fe509aa5f41ba02b73e2ee5e3ab454d /src/boosty.h
parentdd87128bacdff1ad7dd9df166320d4aca6276855 (diff)
fix boosty.h docs / layout. chg boost CMake minver back to 1.35.0
Diffstat (limited to 'src/boosty.h')
-rw-r--r--src/boosty.h60
1 files changed, 48 insertions, 12 deletions
diff --git a/src/boosty.h b/src/boosty.h
index a8c57f8..588c2a9 100644
--- a/src/boosty.h
+++ b/src/boosty.h
@@ -1,5 +1,5 @@
-// boosty.h copyright 2012 don bright. released under the GNU General
-// Public License as described in the file named 'COPYING' in the project root.
+// boosty.h copyright 2012 don bright. released under the GPL 2, or later,
+// as described in the file named 'COPYING' in OpenSCAD's project root.
#ifndef boosty_h_
#define boosty_h_
@@ -9,14 +9,15 @@
versions of boost found on popular versions of linux, circa early 2012.
design
- hope that the user is compiling with boost>1.44 + filesystem v3
- if not, fall back to older deprecated functions, and rely on regression
+ hope that the user is compiling with boost>1.46 + filesystem v3
+ if not, fall back to older deprecated functions, and rely on
testing to find bugs. implement the minimum needed by OpenSCAD and no more.
in a few years, this file should be deleted as unnecessary.
see also
http://www.boost.org/doc/libs/1_48_0/libs/filesystem/v3/doc/index.htm
http://www.boost.org/doc/libs/1_42_0/libs/filesystem/doc/index.htm
+ http://www.boost.org/doc/libs/1_35_0/libs/filesystem/doc/index.htm
include/boost/wave/util/filesystem_compatability.hpp
*/
@@ -27,16 +28,51 @@
namespace fs = boost::filesystem;
namespace boosty {
+
#if BOOST_VERSION >= 104600 && BOOST_FILESYSTEM_VERSION >= 3
-inline bool is_absolute( fs::path p ) { return p.is_absolute(); }
-inline fs::path absolute( fs::path p ) { return fs::absolute( p ); }
-inline std::string stringy( fs::path p ) { return p.generic_string(); }
-inline std::string extension_str( fs::path p) { return p.extension().generic_string(); }
+
+inline bool is_absolute( fs::path p )
+{
+ return p.is_absolute();
+}
+
+inline fs::path absolute( fs::path p )
+{
+ return fs::absolute( p );
+}
+
+inline std::string stringy( fs::path p )
+{
+ return p.generic_string();
+}
+
+inline std::string extension_str( fs::path p)
+{
+ return p.extension().generic_string();
+}
+
#else
-inline bool is_absolute( fs::path p ) { return p.is_complete(); }
-inline fs::path absolute( fs::path p ) { return fs::complete( p ); }
-inline std::string stringy( fs::path p ) { return p.string(); }
-inline std::string extension_str( fs::path p) { return p.extension(); }
+
+inline bool is_absolute( fs::path p )
+{
+ return p.is_complete();
+}
+
+inline fs::path absolute( fs::path p )
+{
+ return fs::complete( p );
+}
+
+inline std::string stringy( fs::path p )
+{
+ return p.string();
+}
+
+inline std::string extension_str( fs::path p)
+{
+ return p.extension();
+}
+
#endif
} // namespace
contact: Jan Huwald // Impressum