diff options
| author | John Wiegley <johnw@newartisans.com> | 2012-05-15 00:22:00 -0600 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2012-05-15 00:22:00 -0600 |
| commit | 72dd4d85bdd1f6da79dee405366311e6da96776b (patch) | |
| tree | e3e0a0d6bb7bec06505965da4e845e12bbc63971 /src/utils.h | |
| parent | 64a9b42381c26baf24e58b40f50f0b253e551811 (diff) | |
| parent | 96172669053bbba7263a370f109f70615049a0c6 (diff) | |
| download | fork-ledger-72dd4d85bdd1f6da79dee405366311e6da96776b.tar.gz fork-ledger-72dd4d85bdd1f6da79dee405366311e6da96776b.tar.bz2 fork-ledger-72dd4d85bdd1f6da79dee405366311e6da96776b.zip | |
Merge branch 'release/v3.0.0-20120510'
Diffstat (limited to 'src/utils.h')
| -rw-r--r-- | src/utils.h | 8 |
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; |