Removal of PLIB/SG from SimGear

[simgear.git] / simgear / misc / strutils.hxx

diff --git a/simgear/misc/strutils.hxx b/simgear/misc/strutils.hxx
index ecc14a59064d0d06891e7d52d02ddc06a7928bc5..162cdb280438f09b23992f9daa08265c91512d0f 100644 (file)
--- a/simgear/misc/strutils.hxx
+++ b/simgear/misc/strutils.hxx
@@ -17,10 +17,9 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 // Library General Public License for more details.
 //
-// You should have received a copy of the GNU Library General Public
-// License along with this library; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA  02111-1307, USA.
+// 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 // $Id$
 
@@ -30,21 +29,13 @@
 
 #include <simgear/compiler.h>
 
-#include STL_STRING
-
+#include <string>
 #include <vector>
-SG_USING_STD(vector);
-
-#ifdef SG_HAVE_STD_INCLUDES
-#  include <cstdlib>
-#else
-#  include <stdlib.h>
-#endif
+#include <cstdlib>
 
-SG_USING_STD(string);
 
 namespace simgear {
-    namespace strutils {
+  namespace strutils {
 
 //     /** 
 //      * atof() wrapper for "string" type
@@ -69,9 +60,9 @@ namespace simgear {
         * @param s String to strip.
         * @return The stripped string.
         */
-       string lstrip( const string& s );
-       string rstrip( const string& s );
-       string strip( const string& s );
+       std::string lstrip( const std::string& s );
+       std::string rstrip( const std::string& s );
+       std::string strip( const std::string& s );
 
        /**
         * Split a string into a words using 'sep' as the delimiter string.
@@ -84,12 +75,12 @@ namespace simgear {
         * resulting in at most maxsplit+1 words.
         * @return Array of words.
         */
-       vector<string>
-       split( const string& s,
+       std::vector<std::string>
+       split( const std::string& s,
               const char* sep = 0,
               int maxsplit = 0 );
-
-    } // end namespace strutils
+  
+  } // end namespace strutils
 } // end namespace simgear
 
 #endif // STRUTILS_H