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.cc | |
| parent | 64a9b42381c26baf24e58b40f50f0b253e551811 (diff) | |
| parent | 96172669053bbba7263a370f109f70615049a0c6 (diff) | |
| download | ledger-72dd4d85bdd1f6da79dee405366311e6da96776b.tar.gz ledger-72dd4d85bdd1f6da79dee405366311e6da96776b.tar.bz2 ledger-72dd4d85bdd1f6da79dee405366311e6da96776b.zip | |
Merge branch 'release/v3.0.0-20120510'
Diffstat (limited to 'src/utils.cc')
| -rw-r--r-- | src/utils.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/utils.cc b/src/utils.cc index 17118904..ada6b600 100644 --- a/src/utils.cc +++ b/src/utils.cc @@ -489,7 +489,7 @@ void report_memory(std::ostream& out, bool report_all) namespace ledger { -#if defined(VERIFY_ON) || defined(HAVE_BOOST_PYTHON) +#if !defined(HAVE_CPP11) && (defined(VERIFY_ON) || defined(HAVE_BOOST_PYTHON)) string::string() : std::string() { TRACE_CTOR(string, ""); @@ -527,7 +527,7 @@ string::~string() throw() { TRACE_DTOR(string); } -#endif // defined(VERIFY_ON) || defined(HAVE_BOOST_PYTHON) +#endif // !defined(HAVE_CPP11) && (defined(VERIFY_ON) || defined(HAVE_BOOST_PYTHON)) string empty_string(""); |