Fix crash on exit when FGCom is not being used.

[flightgear.git] / src / Network / protocol.hxx

diff --git a/src/Network/protocol.hxx b/src/Network/protocol.hxx
index b0c82c558305bf84316ef475e12da6a14e2e5e13..74948163e4fec1aab2b549083d186f5077b6d9b9 100644 (file)
--- a/src/Network/protocol.hxx
+++ b/src/Network/protocol.hxx
@@ -1,4 +1,4 @@
-// protocol.hxx -- High level protocal class
+// protocol.hxx -- High level protocol class
 //
 // Written by Curtis Olson, started November 1999.
 //
@@ -16,7 +16,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$
 
@@ -28,11 +28,11 @@
 #include <simgear/compiler.h>
 #include <simgear/io/iochannel.hxx>
 
-#include STL_STRING
+#include <string>
 #include <vector>
 
-SG_USING_STD(string);
-SG_USING_STD(vector);
+using std::string;
+using std::vector;
 
 
 #define FG_MAX_MSG_SIZE 16384
@@ -100,7 +100,7 @@ typedef io_container::iterator io_iterator;
 typedef io_container::const_iterator const_io_iterator;
 
 #include <stdexcept>
-SG_USING_STD(invalid_argument);
+using std::invalid_argument;
 
 //namespace flightgear { namespace network {
 class FGProtocolConfigError : public invalid_argument