[Monotone-commits-diffs] net.venge.monotone: b95f29a31b0bdfcefe0a168dfa6d8b125ff96e1e

[code]

revision:            b95f29a31b0bdfcefe0a168dfa6d8b125ff96e1e
date:                2011-11-11T19:46:20
author:              Richard Hopkins <address@hidden>
branch:              net.venge.monotone
changelog:
merge of 'a9d1085eb0df7cc8a49d22fbf80d4209cbca564d'
     and 'ef60d096fde0204e1884af172d2b901513a106f0'

manifest:
format_version "1"

new_manifest [b2d1eba7020d8a12310d8d4b5e929b9699194a5c]

old_revision [a9d1085eb0df7cc8a49d22fbf80d4209cbca564d]

patch "src/work.hh"
 from [00e100f44763cad0019683c16c4a13d53a94d5e0]
   to [0ca2a0f0ab94c2421db119216af9373b81f38e61]

old_revision [ef60d096fde0204e1884af172d2b901513a106f0]

patch "src/pcrewrap.cc"
 from [d9e2ecba7b4ce81fb9358343a510070253307424]
   to [59b11bb0076d4724c95c34840409be6d8357a68e]
============================================================
--- src/work.hh	00e100f44763cad0019683c16c4a13d53a94d5e0
+++ src/work.hh	0ca2a0f0ab94c2421db119216af9373b81f38e61
@@ -18,7 +18,7 @@ class lua_hooks;
 class node_restriction;
 struct content_merge_adaptor;
 class lua_hooks;
-class i18n_format;
+struct i18n_format;
 struct options;
 class app_state;
 
============================================================
--- src/pcrewrap.cc	d9e2ecba7b4ce81fb9358343a510070253307424
+++ src/pcrewrap.cc	59b11bb0076d4724c95c34840409be6d8357a68e
@@ -80,7 +80,7 @@ public:
   class regex_cache_manager
   {
 public:
-    regex_cache::iterator find(char const * pattern)
+    regex_cache::const_iterator find(char const * pattern)
       {
         return cache.find(pattern);
       }
@@ -92,7 +92,7 @@ public:
         cache[pattern] = data;
       }
 
-    regex_cache::iterator end()
+    regex_cache::const_iterator end()
       {
         return cache.end();
       }
@@ -122,7 +122,7 @@ private:
     int erroff;
     char const * err;
     // use the cached data if we have it
-    regex_cache::iterator iter = compiled.find(pattern);
+    regex_cache::const_iterator iter = compiled.find(pattern);
     if (iter != compiled.end())
       {
         basedat = iter->second.first;