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

theraysmith · theraysmith · commit aee910a7bfcb · 2017-07-14T10:33:55.000-07:00
diff --git a/ccstruct/Makefile.am b/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 \
diff --git a/ccutil/Makefile.am b/ccutil/Makefile.am
@@ -1,6 +1,7 @@
 AUTOMAKE_OPTIONS = subdir-objects
 SUBDIRS =
 AM_CXXFLAGS =
+AM_CPPFLAGS = -DUSE_STD_NAMESPACE
 
 if !NO_TESSDATA_PREFIX
 AM_CXXFLAGS += -DTESSDATA_PREFIX=@datadir@/
diff --git a/ccutil/platform.h b/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
diff --git a/ccutil/unichar.h b/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.
diff --git a/classify/Makefile.am b/classify/Makefile.am
@@ -1,7 +1,7 @@
 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 \
diff --git a/cutil/Makefile.am b/cutil/Makefile.am
@@ -1,4 +1,4 @@
-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 \
diff --git a/dict/Makefile.am b/dict/Makefile.am
@@ -1,5 +1,5 @@
 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 \
diff --git a/lstm/Makefile.am b/lstm/Makefile.am
@@ -1,7 +1,7 @@
 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)
diff --git a/wordrec/Makefile.am b/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 \

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-AM_CPPFLAGS += -I$(top_srcdir)/ccutil -I$(top_srcdir)/viewer`
	`1`	`+AM_CPPFLAGS += -I$(top_srcdir)/ccutil -I$(top_srcdir)/viewer -DUSE_STD_NAMESPACE`
`2`	`2`
`3`	`3`	`if VISIBILITY`
`4`	`4`	`AM_CPPFLAGS += -DTESS_EXPORTS \`