Fixed build broken by previous commits that added use of string in low-level code

ccstruct/Makefile.am

@@ -2,7 +2,7 @@ AM_CPPFLAGS += \
     -I$(top_srcdir)/ccutil -I$(top_srcdir)/cutil \
     -I$(top_srcdir)/viewer \
     -I$(top_srcdir)/opencl
-AM_CPPFLAGS += $(OPENCL_CPPFLAGS)
+AM_CPPFLAGS += $(OPENCL_CPPFLAGS) -DUSE_STD_NAMESPACE
     
 if VISIBILITY
 AM_CPPFLAGS += -DTESS_EXPORTS \

ccutil/Makefile.am

 AUTOMAKE_OPTIONS = subdir-objects
 SUBDIRS =
 AM_CXXFLAGS =
+AM_CPPFLAGS = -DUSE_STD_NAMESPACE
 
 if !NO_TESSDATA_PREFIX
 AM_CXXFLAGS += -DTESSDATA_PREFIX=@datadir@/

ccutil/platform.h

@@ -53,6 +53,12 @@
 #define SIGNED signed
 #endif
 
+// Fix to map between google use of string without std and everywhere else.
+#ifdef USE_STD_NAMESPACE
+#include <string>
+using std::string;
+#endif
+
 #if defined(_WIN32) || defined(__CYGWIN__)
 #ifndef M_PI
 #define M_PI 3.14159265358979323846

ccutil/unichar.h

@@ -24,6 +24,7 @@
 #include <string.h>
 #include <string>
 #include <vector>
+#include "platform.h"
 
 // Maximum number of characters that can be stored in a UNICHAR. Must be
 // at least 4. Must not exceed 31 without changing the coding of length.

classify/Makefile.am

 AM_CPPFLAGS += \
     -I$(top_srcdir)/cutil -I$(top_srcdir)/ccutil \
     -I$(top_srcdir)/ccstruct -I$(top_srcdir)/dict \
-    -I$(top_srcdir)/viewer
+    -I$(top_srcdir)/viewer -DUSE_STD_NAMESPACE
     
 if VISIBILITY
 AM_CPPFLAGS += -DTESS_EXPORTS \

cutil/Makefile.am

-AM_CPPFLAGS += -I$(top_srcdir)/ccutil -I$(top_srcdir)/viewer
+AM_CPPFLAGS += -I$(top_srcdir)/ccutil -I$(top_srcdir)/viewer -DUSE_STD_NAMESPACE
 
 if VISIBILITY
 AM_CPPFLAGS += -DTESS_EXPORTS \

dict/Makefile.am

 AM_CPPFLAGS += -I$(top_srcdir)/cutil -I$(top_srcdir)/ccutil \
-    -I$(top_srcdir)/ccstruct -I$(top_srcdir)/viewer
+    -I$(top_srcdir)/ccstruct -I$(top_srcdir)/viewer -DUSE_STD_NAMESPACE
     
 if VISIBILITY
 AM_CPPFLAGS += -DTESS_EXPORTS \

lstm/Makefile.am

 AM_CPPFLAGS += \
     -I$(top_srcdir)/ccutil -I$(top_srcdir)/cutil -I$(top_srcdir)/ccstruct \
     -I$(top_srcdir)/arch -I$(top_srcdir)/viewer -I$(top_srcdir)/classify \
-    -I$(top_srcdir)/dict -I$(top_srcdir)/lstm
+    -I$(top_srcdir)/dict -I$(top_srcdir)/lstm -DUSE_STD_NAMESPACE
 AUTOMAKE_OPTIONS = subdir-objects
 SUBDIRS =
 AM_CXXFLAGS = $(OPENMP_CXXFLAGS)

wordrec/Makefile.am

@@ -2,7 +2,7 @@ AM_CPPFLAGS += \
     -I$(top_srcdir)/ccstruct -I$(top_srcdir)/ccutil \
     -I$(top_srcdir)/cutil -I$(top_srcdir)/classify \
     -I$(top_srcdir)/dict \
-    -I$(top_srcdir)/viewer
+    -I$(top_srcdir)/viewer -DUSE_STD_NAMESPACE
 
 if VISIBILITY
 AM_CPPFLAGS += -DTESS_EXPORTS \