hla: Use HLADataElementIndices for HLAInteractionClass.

[simgear.git] / simgear / io / sg_socket_udp.hxx

diff --git a/simgear/io/sg_socket_udp.hxx b/simgear/io/sg_socket_udp.hxx
index 731909afe6638fe585f674931bcb4f9b648fe5a1..9234c413820b87edc38fb8a633fe4eed93278784 100644 (file)
--- a/simgear/io/sg_socket_udp.hxx
+++ b/simgear/io/sg_socket_udp.hxx
@@ -28,20 +28,13 @@
 #define _SG_SOCKET_UDP_HXX
 
 
-#ifndef __cplusplus
-# error This library requires C++
-#endif
-
-#include <plib/netSocket.h>
-
 #include <simgear/compiler.h>
 
-#include STL_STRING
+#include <string>
 
 #include <simgear/math/sg_types.hxx>
 #include <simgear/io/iochannel.hxx>
-
-SG_USING_STD(string);
+#include <simgear/io/raw_socket.hxx>
 
 /**
  * A UDP socket I/O class based on SGIOChannel and plib/net.
@@ -50,10 +43,10 @@ class SGSocketUDP : public SGIOChannel {
 
 private:
 
-    netSocket sock;
+    simgear::Socket sock;
 
-    string hostname;
-    string port_str;
+    std::string hostname;
+    std::string port_str;
 
     char save_buf[ 2 * SG_IO_MAX_MSG_SIZE ];
     int save_len;
@@ -96,7 +89,7 @@ public:
      * @param host name of host if direction is SG_IO_OUT or SG_IO_BI
      * @param port port number if we care to choose one.
      * @param style specify "udp" or "tcp" */
-    SGSocketUDP( const string& host, const string& port );
+    SGSocketUDP( const std::string& host, const std::string& port );
 
     /** Destructor */
     ~SGSocketUDP();
@@ -128,10 +121,10 @@ public:
     bool setBlocking( bool value );
 
     /** @return the remote host name */
-    inline string get_hostname() const { return hostname; }
+    inline std::string get_hostname() const { return hostname; }
 
     /** @return the port number (in string form) */
-    inline string get_port_str() const { return port_str; }
+    inline std::string get_port_str() const { return port_str; }
 };