From ac885a907525589aa56266d9a2527cdc7127c9cb Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Tue, 10 Nov 2009 18:44:08 -0500
Subject: All strings passed to Python are now Unicode objects

---
 src/utils.cc | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

(limited to 'src/utils.cc')

diff --git a/src/utils.cc b/src/utils.cc
index 2f2899fb..6cef1a8c 100644
--- a/src/utils.cc
+++ b/src/utils.cc
@@ -406,8 +406,16 @@ void report_memory(std::ostream& out, bool report_all)
   }
 }
 
+} // namespace ledger
+
+#endif // VERIFY_ON
+
+/**********************************************************************
+ *
+ * String wrapper
+ */
 
-#if defined(STRING_VERIFY_ON)
+namespace ledger {
 
 string::string() : std::string() {
   TRACE_CTOR(string, "");
@@ -445,18 +453,10 @@ string::~string() throw() {
   TRACE_DTOR(string);
 }
 
-#endif // STRING_VERIFY_ON
+string empty_string("");
 
-} // namespace ledger
-
-#endif // VERIFY_ON
-
-ledger::string empty_string("");
-
-ledger::strings_list split_arguments(const char * line)
+strings_list split_arguments(const char * line)
 {
-  using namespace ledger;
-
   strings_list args;
 
   char buf[4096];
@@ -506,6 +506,8 @@ ledger::strings_list split_arguments(const char * line)
   return args;
 }
 
+} // namespace ledger
+
 /**********************************************************************
  *
  * Logging
-- 
cgit v1.2.3