#
#
# patch "vocab.cc"
#  from [b6008dbf8b209e237952bb90e934f94d6fbca416]
#    to [d96db5af03e4941af6bbc0e86aedb20d3725d47f]
# 
# patch "vocab.hh"
#  from [6ccbe5b9ab2907f2cf15072d68c4369e3862b137]
#    to [61bc19598cbf8668c41855cfa0841af03079be30]
#
============================================================
--- vocab.cc	b6008dbf8b209e237952bb90e934f94d6fbca416
+++ vocab.cc	d96db5af03e4941af6bbc0e86aedb20d3725d47f
@@ -18,6 +18,8 @@ using std::string;
 
 using std::string;
 
+std::string immutable_string::empty;
+
 // verifiers for various types of data
 
 // Every ENCODING and ATOMIC type not defined with the _NOVERIFY variant in
============================================================
--- vocab.hh	6ccbe5b9ab2907f2cf15072d68c4369e3862b137
+++ vocab.hh	61bc19598cbf8668c41855cfa0841af03079be30
@@ -23,14 +23,11 @@
 // than string refcopy on my system (g++ 4). This only happens because
 // we tell Boost not to worry about threads... but I don't recognize any
 // thread stuff in the string headers.
-namespace
-{
-  std::string empty;
-}
 
 class immutable_string
 {
   boost::shared_ptr<std::string> _rep;
+  static std::string empty;
 
 public:
   immutable_string()
@@ -48,9 +45,6 @@ public:
   }
 };
 
-
-
-
 #include "vocab_macros.hh"
 #define ENCODING(enc) hh_ENCODING(enc)
 #define ENCODING_NOVERIFY(enc) hh_ENCODING_NOVERIFY(enc)