Merge branch 'timoore/effects-anim-rebase' into next

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

diff --git a/simgear/io/iochannel.hxx b/simgear/io/iochannel.hxx
index 48c782a1e045b05d91b66c94f9b79db403c697be..d8a29608db20b2dbef3e6b2974bcce3881ab709a 100644 (file)
--- a/simgear/io/iochannel.hxx
+++ b/simgear/io/iochannel.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$
 
@@ -32,11 +32,11 @@
 
 // #include "protocol.hxx"
 
-#include STL_STRING
+#include <string>
 #include <vector>
 
-SG_USING_STD(vector);
-SG_USING_STD(string);
+using std::vector;
+using std::string;
 
 
 #define SG_IO_MAX_MSG_SIZE 16384