From a1ab34b01fcfa972cbf84dae0b37ad3fbc9a3792 Mon Sep 17 00:00:00 2001
From: Valerio Mariani <valerio.mariani@unibas.ch>
Date: Wed, 13 Jun 2012 23:58:10 +0200
Subject: [PATCH] Added ifdef for boost v3
---
modules/base/src/platform.cc | 6 +++++-
modules/mol/alg/src/{ldt.cc => lddt.cc} | 0
.../alg/src/{local_dist_test.cc => local_dist_diff_test.cc} | 0
.../alg/src/{local_dist_test.hh => local_dist_diff_test.hh} | 0
4 files changed, 5 insertions(+), 1 deletion(-)
rename modules/mol/alg/src/{ldt.cc => lddt.cc} (100%)
rename modules/mol/alg/src/{local_dist_test.cc => local_dist_diff_test.cc} (100%)
rename modules/mol/alg/src/{local_dist_test.hh => local_dist_diff_test.hh} (100%)
diff --git a/modules/base/src/platform.cc b/modules/base/src/platform.cc
index 52e75870f..736ae6e0d 100644
--- a/modules/base/src/platform.cc
+++ b/modules/base/src/platform.cc
@@ -35,7 +35,11 @@ String GetPrefixPath()
String GetSharedDataPath()
{
- return (path(GetPrefixPath()) / "share" / "openstructure").string();
+ #if BOOST_FILESYSTEM_VERSION==3 || BOOST_VERSION<103400
+ return (path(GetPrefixPath()) / "share" / "openstructure").native();
+ #else
+ return (path(GetPrefixPath()) / "share" / "openstructure").native_file_string();
+ #endif
}
}
diff --git a/modules/mol/alg/src/ldt.cc b/modules/mol/alg/src/lddt.cc
similarity index 100%
rename from modules/mol/alg/src/ldt.cc
rename to modules/mol/alg/src/lddt.cc
diff --git a/modules/mol/alg/src/local_dist_test.cc b/modules/mol/alg/src/local_dist_diff_test.cc
similarity index 100%
rename from modules/mol/alg/src/local_dist_test.cc
rename to modules/mol/alg/src/local_dist_diff_test.cc
diff --git a/modules/mol/alg/src/local_dist_test.hh b/modules/mol/alg/src/local_dist_diff_test.hh
similarity index 100%
rename from modules/mol/alg/src/local_dist_test.hh
rename to modules/mol/alg/src/local_dist_diff_test.hh
--
GitLab