# 
# patch "ChangeLog"
#  from [071b735e3fe20e5b913af693b890b41cd7b0d64d]
#    to [9e9daa4c088a4f485b7487510115847c26295e05]
# 
# patch "paths.cc"
#  from [125b75ce333f2a5d183fe41b578e736958ed7854]
#    to [65e0f4d000bc1eb76582d0b07213094b5746d564]
# 
========================================================================
--- ChangeLog	071b735e3fe20e5b913af693b890b41cd7b0d64d
+++ ChangeLog	9e9daa4c088a4f485b7487510115847c26295e05
@@ -1,3 +1,9 @@
+2005-08-31  Matthew Gregan  <address@hidden>
+
+	* paths.cc (test_bookkeeping_path, test_system_path): Second
+	attempt at compile fixes; this time the unit tests actually pass
+	too.
+
 2005-08-30  Matthew Gregan  <address@hidden>
 
 	* paths.cc (test_bookkeeping_path, test_system_path): Shift object
========================================================================
--- paths.cc	125b75ce333f2a5d183fe41b578e736958ed7854
+++ paths.cc	65e0f4d000bc1eb76582d0b07213094b5746d564
@@ -805,18 +805,16 @@
                             "",
                             "a:b",
                             0 };
-  
+  std::string tmp_path_string;
+
   for (char const ** c = baddies; *c; ++c)
     {
       L(F("test_bookkeeping_path baddie: trying '%s'") % *c);
-      std::string path_string(*c);
-      BOOST_CHECK_THROW(bookkeeping_path(path_string), std::logic_error);
-      BOOST_CHECK_THROW(bookkeeping_root / path_string, std::logic_error);
+            BOOST_CHECK_THROW(bookkeeping_path(tmp_path_string.assign(*c)), std::logic_error);
+            BOOST_CHECK_THROW(bookkeeping_root / tmp_path_string.assign(*c), std::logic_error);
     }
-  std::string path_foo_bar("foo/bar");
-  BOOST_CHECK_THROW(bookkeeping_path(path_foo_bar), std::logic_error);
-  std::string path_a("a");
-  BOOST_CHECK_THROW(bookkeeping_path(path_a), std::logic_error);
+  BOOST_CHECK_THROW(bookkeeping_path(tmp_path_string.assign("foo/bar")), std::logic_error);
+  BOOST_CHECK_THROW(bookkeeping_path(tmp_path_string.assign("a")), std::logic_error);
   
   check_bk_normalizes_to("a", "MT/a");
   check_bk_normalizes_to("foo", "MT/foo");