Merge branch 'jmt/magvar' into next

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

diff --git a/simgear/io/sg_socket.hxx b/simgear/io/sg_socket.hxx
index b1965c512fcef9541aeb7c199bc1d7710f7935c5..78c9d2d892aa6ffb460dfb5ce4831058cc7040ed 100644 (file)
--- a/simgear/io/sg_socket.hxx
+++ b/simgear/io/sg_socket.hxx
@@ -19,7 +19,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 // $Id$
 
@@ -34,14 +34,14 @@
 
 #include <simgear/compiler.h>
 
-#include STL_STRING
+#include <string>
 
 #include <simgear/math/sg_types.hxx>
 #include <simgear/io/iochannel.hxx>
 
 #include <plib/netSocket.h>
 
-SG_USING_STD(string);
+using std::string;
 
 #define SG_MAX_SOCKET_QUEUE 32