summaryrefslogtreecommitdiff
path: root/src/utils.h
diff options
context:
space:
mode:
authorJohn Wiegley <johnw@newartisans.com>2012-04-28 05:23:36 -0500
committerJohn Wiegley <johnw@newartisans.com>2012-04-28 05:23:36 -0500
commitc8f58ea6860b1ce2d4f0d8d039fd3a58727743a5 (patch)
tree1bb073ee58788a2f292d7364ae9cf438659fb5b0 /src/utils.h
parent1a45d745438b4571d23c19a0c3fe97f68bccd4f0 (diff)
downloadfork-ledger-c8f58ea6860b1ce2d4f0d8d039fd3a58727743a5.tar.gz
fork-ledger-c8f58ea6860b1ce2d4f0d8d039fd3a58727743a5.tar.bz2
fork-ledger-c8f58ea6860b1ce2d4f0d8d039fd3a58727743a5.zip
Added support for building with Clang and libc++ in C++11
Diffstat (limited to 'src/utils.h')
-rw-r--r--src/utils.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/utils.h b/src/utils.h
index 8f11f75a..34011e3f 100644
--- a/src/utils.h
+++ b/src/utils.h
@@ -72,7 +72,7 @@
namespace ledger {
using namespace boost;
-#if defined(VERIFY_ON) || defined(HAVE_BOOST_PYTHON)
+#if !defined(HAVE_CPP11) && (defined(VERIFY_ON) || defined(HAVE_BOOST_PYTHON))
class string;
#else
typedef std::string string;
@@ -93,7 +93,7 @@ namespace ledger {
}
#if BOOST_FILESYSTEM_VERSION == 3
-#if defined(VERIFY_ON) || defined(HAVE_BOOST_PYTHON)
+#if !defined(HAVE_CPP11) && (defined(VERIFY_ON) || defined(HAVE_BOOST_PYTHON))
namespace boost { namespace filesystem3 { namespace path_traits {
template<> struct is_pathable<ledger::string> { static const bool value = true; };
}}}
@@ -193,7 +193,7 @@ void report_memory(std::ostream& out, bool report_all = false);
namespace ledger {
-#if defined(VERIFY_ON) || defined(HAVE_BOOST_PYTHON)
+#if !defined(HAVE_CPP11) && (defined(VERIFY_ON) || defined(HAVE_BOOST_PYTHON))
class string : public std::string
{
@@ -272,7 +272,7 @@ inline bool operator!=(const char* __lhs, const string& __rhs)
inline bool operator!=(const string& __lhs, const char* __rhs)
{ return __lhs.compare(__rhs) != 0; }
-#endif // defined(VERIFY_ON) || defined(HAVE_BOOST_PYTHON)
+#endif // !defined(HAVE_CPP11) && (defined(VERIFY_ON) || defined(HAVE_BOOST_PYTHON))
extern string empty_string;