X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=simgear%2Fmisc%2Ftabbed_values_test.cxx;h=64f3b60241ffb9e59b9a82e80f613926b27e85b1;hb=2e71b64de1d937e2b7c34dd4a2365be455d0b82a;hp=90825009a835567fa7275eefdd618f21ab568e87;hpb=7379d8a54d2df3c041b42eb4002426b7834ba8b6;p=simgear.git

diff --git a/simgear/misc/tabbed_values_test.cxx b/simgear/misc/tabbed_values_test.cxx
index 90825009..64f3b602 100644
--- a/simgear/misc/tabbed_values_test.cxx
+++ b/simgear/misc/tabbed_values_test.cxx
@@ -4,12 +4,12 @@
 
 #include <simgear/compiler.h>
 
-#include STL_IOSTREAM
+#include <iostream>
 #include "tabbed_values.hxx"
 
-SG_USING_STD(cout);
-SG_USING_STD(cerr);
-SG_USING_STD(endl);
+using std::cout;
+using std::cerr;
+using std::endl;
 
 
 int main (int ac, char ** av)
@@ -18,17 +18,17 @@ int main (int ac, char ** av)
 	
 	SGTabbedValues tv(string1);
 	
-	if (tv[0] != string("Hello")) {
+	if (tv[0] != "Hello") {
 		cerr << "failed to read string at index 0" << endl;
 		return 1;
 	}
 	
-	if (tv[1] != string("World")) {
+	if (tv[1] != "World") {
 		cerr << "failed to read string at index 1" << endl;
 		return 1;
 	}
 	
-	if (tv[2] != string("34")) {
+	if (tv[2] != "34") {
 		cerr << "failed to read string at index 2" << endl;
 		return 1;
 	}
@@ -61,7 +61,7 @@ int main (int ac, char ** av)
 		return 3;
 	}
 	
-	if (tv[5] != string("There Is No Spoon")) {
+	if (tv[5] != "There Is No Spoon") {
 		cerr << "failed to read string at index 5 (got [" << tv[5] << "]" << endl;
 		return 1;
 	}