adapted to newest ticcutils Socket stuff

LanguageMachines · Apr 6, 2020 · 1363801 · 1363801
1 parent 68c5966
commit 1363801
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 13 deletions.
diff --git a/configure.ac b/configure.ac
@@ -94,7 +94,7 @@ AC_ARG_WITH(ticcutils,
        [  --with-ticcutils=DIR       use ticcutils installed in <DIR>],
        [PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$withval/lib/pkgconfig"],
        [PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$prefix/lib/pkgconfig"])
-PKG_CHECK_MODULES([ticcutils], [ticcutils >= 0.22] )
+PKG_CHECK_MODULES([ticcutils], [ticcutils >= 0.24] )
 CXXFLAGS="$CXXFLAGS $ticcutils_CFLAGS"
 LIBS="$ticcutils_LIBS $LIBS"
 

diff --git a/src/generator.cc b/src/generator.cc
@@ -506,7 +506,7 @@ int generate_server( Logfile& l, Config& c ) {
 
   while ( true ) {
 
-    Sockets::ServerSocket *newSock = new Sockets::ServerSocket();
+    Sockets::ClientSocket *newSock = new Sockets::ClientSocket();
     if ( !server.accept( *newSock ) ) {
       if( errno == EINTR ) {
 	continue;

diff --git a/src/levenshtein.cc b/src/levenshtein.cc
@@ -1760,7 +1760,7 @@ int server_sc( Logfile& l, Config& c ) {
     while ( running ) {  // main accept() loop
       l.log( "Listening..." );
 
-      Sockets::ServerSocket *newSock = new Sockets::ServerSocket();
+      Sockets::ClientSocket *newSock = new Sockets::ClientSocket();
       if ( !server.accept( *newSock ) ) {
 	if( errno == EINTR ) {
 	  continue;
@@ -2173,7 +2173,7 @@ int server_sc_nf( Logfile& l, Config& c ) {
     while ( true ) {  // main accept() loop
       l.log( "Listening..." );
 
-      Sockets::ServerSocket *newSock = new Sockets::ServerSocket();
+      Sockets::ClientSocket *newSock = new Sockets::ClientSocket();
       if ( !server.accept( *newSock ) ) {
 	if( errno == EINTR ) {
 	  continue;

diff --git a/src/ngram_server.cc b/src/ngram_server.cc
@@ -130,7 +130,7 @@ int ngram_server(Logfile& l, Config& c) {
   l.log( "Starting server..." );
   std::string buf;
   while ( true ) {
-    Sockets::ServerSocket *newSock = new Sockets::ServerSocket();
+    Sockets::ClientSocket *newSock = new Sockets::ClientSocket();
     if ( !server.accept( *newSock ) ) {
       if( errno == EINTR ) {
 	continue;

diff --git a/src/prededit.cc b/src/prededit.cc
@@ -1459,7 +1459,7 @@ int pdt2web( Logfile& l, Config& c ) {
 
     l.log( "Listening..." );
 
-    Sockets::ServerSocket *newSock = new Sockets::ServerSocket();
+    Sockets::ClientSocket *newSock = new Sockets::ClientSocket();
     if ( !server.accept( *newSock ) ) {
       if( errno == EINTR ) {
 	continue;

diff --git a/src/server.cc b/src/server.cc
@@ -192,7 +192,7 @@ int server2(Logfile& l, Config& c) {
     // loop
     while ( c.get_status() != 0 ) {  // main accept() loop
 
-      Sockets::ServerSocket *newSock = new Sockets::ServerSocket();
+      Sockets::ClientSocket *newSock = new Sockets::ClientSocket();
       if ( !server.accept( *newSock ) ) {
 	if( errno == EINTR ) {
 	  continue;
@@ -893,7 +893,7 @@ int server4( Logfile& l, Config& c) {
     while ( running ) {  // main accept() loop
       l.log( "Listening..." );
 
-      Sockets::ServerSocket *newSock = new Sockets::ServerSocket();
+      Sockets::ClientSocket *newSock = new Sockets::ClientSocket();
       if ( !server.accept( *newSock ) ) {
 	if( errno == EINTR ) {
 	  continue;
@@ -1275,7 +1275,7 @@ int xmlserver(Logfile& l, Config& c) {
     while ( running ) {  // main accept() loop
       l.log( "Listening..." );
 
-      Sockets::ServerSocket *newSock = new Sockets::ServerSocket();
+      Sockets::ClientSocket *newSock = new Sockets::ClientSocket();
       if ( !server.accept( *newSock ) ) {
 	if( errno == EINTR ) {
 	  continue;
@@ -1650,7 +1650,7 @@ int mbmt(Logfile& l, Config& c) {
     while ( running ) {  // main accept() loop
       l.log( "Listening..." );
 
-      Sockets::ServerSocket *newSock = new Sockets::ServerSocket();
+      Sockets::ClientSocket *newSock = new Sockets::ClientSocket();
       if ( !server.accept( *newSock ) ) {
 	if( errno == EINTR ) {
 	  continue;
@@ -1985,7 +1985,7 @@ int webdemo(Logfile& l, Config& c) {
     bool skip = false;
 
     while ( true ) {
-      Sockets::ServerSocket *newSock = new Sockets::ServerSocket();
+      Sockets::ClientSocket *newSock = new Sockets::ClientSocket();
       if ( !server.accept( *newSock ) ) {
 	if( errno == EINTR ) {
 	  continue;
@@ -2186,7 +2186,7 @@ int one( Logfile& l, Config& c) {
 
 
     while ( true ) {
-      Sockets::ServerSocket *newSock = new Sockets::ServerSocket();
+      Sockets::ClientSocket *newSock = new Sockets::ClientSocket();
       if ( !server.accept( *newSock ) ) {
 	if( errno == EINTR ) {
 	  continue;
@@ -2467,7 +2467,7 @@ int server_mg( Logfile& l, Config& c ) {
     while ( running ) {  // main accept() loop
       l.log( "Listening..." );
 
-      Sockets::ServerSocket *newSock = new Sockets::ServerSocket();
+      Sockets::ClientSocket *newSock = new Sockets::ClientSocket();
       if ( !server.accept( *newSock ) ) {
 	if( errno == EINTR ) {
 	  continue;