This patch is part of a series of patches for speech-tools for
Debian GNU/Linux, which primarily fix build errors with GCC 4.3 and newer.

--- speech-tools-1.2.3.orig/utils/EST_ServiceTable.cc
+++ speech-tools-1.2.3/utils/EST_ServiceTable.cc
@@ -42,10 +42,12 @@
 #include "EST_error.h"
 #include "EST_Token.h"
 #include "EST_ServiceTable.h"
-#include <iomanip.h>
-#include <iostream.h>
+#include <iomanip>
+#include <iostream>
 #include <time.h>
 
+using namespace std;
+
 #if defined(SYSTEM_IS_WIN32)
 #    define seed_random() srand((unsigned)time(NULL))
 #    define get_random() rand()
@@ -154,15 +156,15 @@
       Entry &entry = entries.t.val(name);
 
       if (type=="host")
-	entry.hostname=val;
+	entry.hostname=EST_String(val);
       else if (type=="address")
-	entry.address=val;
+	entry.address=EST_String(val);
       else if (type=="type")
-	entry.type=val;
+	entry.type=EST_String(val);
       else if (type=="port")
 	entry.port=val;
       else if (type=="cookie")
-	entry.cookie=val;
+	entry.cookie=EST_String(val);
       else
 	EST_warning("Unknown entry field '%s' at %s",
 		    (const char *)type,