Reverted tinxml source to be identical to what was released as 2.5.3

tools/rospack/CMakeLists.txt

@@ -9,6 +9,7 @@ SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
 
 include_directories(include ${PROJECT_SOURCE_DIR})
 
+add_definitions(-DTIXML_USE_STL)
 add_library(rospack SHARED rospack.cpp
                     tinyxml-2.5.3/tinystr.cpp
                     tinyxml-2.5.3/tinyxml.cpp

tools/rospack/tinyxml-2.5.3/tinyxml.h

@@ -43,11 +43,6 @@ distribution.
 #define DEBUG
 #endif
 
-// This line was added because we are using STL in the ROS project.
-// the following line is NOT in the distributed version of TinyXML
-// it is added just so the Windows project files are a bit easier to set up
-#define TIXML_USE_STL  
-
 #ifdef TIXML_USE_STL
 	#include <string>
  	#include <iostream>

tools/rospack/tinyxml-2.5.3/tinyxmlparser.cpp

@@ -354,7 +354,7 @@ const char* TiXmlBase::SkipWhiteSpace( const char* p, TiXmlEncoding encoding )
 	}
 	else
 	{
-		while ( ( *p && IsWhiteSpace( *p ) ) || *p == '\n' || *p =='\r' )
+		while ( *p && IsWhiteSpace( *p ) || *p == '\n' || *p =='\r' )
 			++p;
 	}