certi libCERTI/SocketUDP.hh libCERTI/SocketTCP....

[certi-cvs]

CVSROOT:        /sources/certi
Module name:    certi
Changes by:     Eric NOULARD <erk>      07/12/09 16:46:50

Modified files:
        libCERTI       : SocketUDP.hh SocketTCP.cc SocketTCP.hh 
                         SocketUDP.cc 
        RTIA           : Communications.cc 

Log message:
        Suppress "deprecated conversion from const char* to char*"
        compiler warning.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/SocketUDP.hh?cvsroot=certi&r1=3.9&r2=3.10
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/SocketTCP.cc?cvsroot=certi&r1=3.19&r2=3.20
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/SocketTCP.hh?cvsroot=certi&r1=3.18&r2=3.19
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/SocketUDP.cc?cvsroot=certi&r1=3.16&r2=3.17
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/Communications.cc?cvsroot=certi&r1=3.19&r2=3.20

Patches:
Index: libCERTI/SocketUDP.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/SocketUDP.hh,v
retrieving revision 3.9
retrieving revision 3.10
diff -u -b -r3.9 -r3.10
--- libCERTI/SocketUDP.hh       20 Nov 2007 09:04:54 -0000      3.9
+++ libCERTI/SocketUDP.hh       9 Dec 2007 16:46:50 -0000       3.10
@@ -63,7 +63,7 @@
        virtual void close();
 
        // SocketUDP
-       void createUDPClient(unsigned int port, char *nom_serveur)
+       void createUDPClient(unsigned int port, const char *nom_serveur)
        throw (NetworkError, NetworkSignal);
 
        void createUDPServer(unsigned int port)

Index: libCERTI/SocketTCP.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/SocketTCP.cc,v
retrieving revision 3.19
retrieving revision 3.20
diff -u -b -r3.19 -r3.20
--- libCERTI/SocketTCP.cc       27 Nov 2007 08:55:54 -0000      3.19
+++ libCERTI/SocketTCP.cc       9 Dec 2007 16:46:50 -0000       3.20
@@ -17,7 +17,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 // USA
 //
-// $Id: SocketTCP.cc,v 3.19 2007/11/27 08:55:54 erk Exp $
+// $Id: SocketTCP.cc,v 3.20 2007/12/09 16:46:50 erk Exp $
 // ----------------------------------------------------------------------------
 
 #ifdef _WIN32
@@ -286,7 +286,7 @@
 
 // ----------------------------------------------------------------------------
 void
-SocketTCP::createTCPClient(in_port_t port, char *nom_serveur)
+SocketTCP::createTCPClient(in_port_t port, const char *nom_serveur)
 throw (NetworkError)
 {
        std::stringstream msg;
@@ -619,4 +619,4 @@
 
 } // namespace
 
-// $Id: SocketTCP.cc,v 3.19 2007/11/27 08:55:54 erk Exp $
+// $Id: SocketTCP.cc,v 3.20 2007/12/09 16:46:50 erk Exp $

Index: libCERTI/SocketTCP.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/SocketTCP.hh,v
retrieving revision 3.18
retrieving revision 3.19
diff -u -b -r3.18 -r3.19
--- libCERTI/SocketTCP.hh       27 Nov 2007 08:55:54 -0000      3.18
+++ libCERTI/SocketTCP.hh       9 Dec 2007 16:46:50 -0000       3.19
@@ -52,7 +52,7 @@
        virtual ~SocketTCP();
        virtual void close();
 
-       void createTCPClient(in_port_t port, char *nom_serveur) throw 
(NetworkError);
+       void createTCPClient(in_port_t port, const char *nom_serveur) throw 
(NetworkError);
        void createTCPClient(in_port_t port, in_addr_t addr) throw 
(NetworkError);
        void createTCPServer(in_port_t port = 0, in_addr_t addr = INADDR_ANY) 
throw (NetworkError);
 

Index: libCERTI/SocketUDP.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/SocketUDP.cc,v
retrieving revision 3.16
retrieving revision 3.17
diff -u -b -r3.16 -r3.17
--- libCERTI/SocketUDP.cc       20 Nov 2007 09:04:54 -0000      3.16
+++ libCERTI/SocketUDP.cc       9 Dec 2007 16:46:50 -0000       3.17
@@ -84,7 +84,7 @@
 //! Create an UDP client.
 void
 SocketUDP::createUDPClient(unsigned int, // port
-                           char *) // nom serveur
+                           const char *) // nom serveur
     throw (NetworkError, NetworkSignal)
 {
 // unsigned long addr = 0 ;

Index: RTIA/Communications.cc
===================================================================
RCS file: /sources/certi/certi/RTIA/Communications.cc,v
retrieving revision 3.19
retrieving revision 3.20
diff -u -b -r3.19 -r3.20
--- RTIA/Communications.cc      20 Nov 2007 09:04:54 -0000      3.19
+++ RTIA/Communications.cc      9 Dec 2007 16:46:50 -0000       3.20
@@ -18,7 +18,7 @@
 // along with this program ; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 //
-// $Id: Communications.cc,v 3.19 2007/11/20 09:04:54 erk Exp $
+// $Id: Communications.cc,v 3.20 2007/12/09 16:46:50 erk Exp $
 // ----------------------------------------------------------------------------
 
 #include <config.h>
@@ -103,18 +103,18 @@
     : SocketUN(), SecureTCPSocket(), SocketUDP()
 {
     char nom_serveur_RTIG[200] ;
-    char *default_host = "localhost" ;
+    const char *default_host = "localhost" ;
 
     // Federate/RTIA link creation.
     acceptUN();
 
     // RTIG TCP link creation.
-    char *certihost = 0 ;
+    const char *certihost = NULL ;
     ifstream* file = new ifstream("RTIA.dat", ios::in);
 
     if (!file->is_open()) {
        certihost = getenv("CERTI_HOST");
-       if (certihost == NULL) {
+       if (NULL == certihost) {
            certihost = default_host ;
        }
     }
@@ -342,4 +342,4 @@
 
 }} // namespace certi/rtia
 
-// $Id: Communications.cc,v 3.19 2007/11/20 09:04:54 erk Exp $
+// $Id: Communications.cc,v 3.20 2007/12/09 16:46:50 erk Exp $