--- code/trunk/pcre_stringpiece.h.in	2007/02/24 21:40:45	77
+++ code/trunk/pcre_stringpiece.h.in	2010/11/26 11:16:43	580
@@ -38,23 +38,27 @@
 #ifndef _PCRE_STRINGPIECE_H
 #define _PCRE_STRINGPIECE_H
 
-#include <string.h>
+#include <cstring>
 #include <string>
 #include <iosfwd>    // for ostream forward-declaration
 
-#if @pcre_has_type_traits@
+#if @pcre_have_type_traits@
 #define HAVE_TYPE_TRAITS
 #include <type_traits.h>
-#elif @pcre_has_bits_type_traits@
+#elif @pcre_have_bits_type_traits@
 #define HAVE_TYPE_TRAITS
 #include <bits/type_traits.h>
 #endif
 
+#include <pcre.h>
+
+using std::memcmp;
+using std::strlen;
 using std::string;
 
 namespace pcrecpp {
 
-class StringPiece {
+class PCRECPP_EXP_DEFN StringPiece {
  private:
   const char*   ptr_;
   int           length_;
@@ -66,7 +70,10 @@
   StringPiece()
     : ptr_(NULL), length_(0) { }
   StringPiece(const char* str)
-    : ptr_(str), length_(static_cast<int>(strlen(str))) { }
+    : ptr_(str), length_(static_cast<int>(strlen(ptr_))) { }
+  StringPiece(const unsigned char* str)
+    : ptr_(reinterpret_cast<const char*>(str)),
+      length_(static_cast<int>(strlen(ptr_))) { }
   StringPiece(const string& str)
     : ptr_(str.data()), length_(static_cast<int>(str.size())) { }
   StringPiece(const char* offset, int len)