X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=simgear%2Fmisc%2Fstrutils.cxx;h=8ccb4c502f8b07444fab834e7954fef8314bfebf;hb=2e71b64de1d937e2b7c34dd4a2365be455d0b82a;hp=2933e0d58427a6627ebc7f329d36c90baf2d3175;hpb=6a3d1895d9d9f90092b393675ba50df7b1cf3c5e;p=simgear.git

diff --git a/simgear/misc/strutils.cxx b/simgear/misc/strutils.cxx
index 2933e0d5..8ccb4c50 100644
--- a/simgear/misc/strutils.cxx
+++ b/simgear/misc/strutils.cxx
@@ -14,14 +14,15 @@
 // 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$
 
 #include <ctype.h>
+#include <cstring>
+
 #include "strutils.hxx"
 
 namespace simgear {
@@ -41,14 +42,14 @@ namespace simgear {
 
 	    while (i < len)
 	    {
-		while (i < len && isspace(str[i]))
+		while (i < len && isspace((unsigned char)str[i]))
 		{
 		    ++i;
 		}
 
 		j = i;
 
-		while (i < len && !isspace(str[i]))
+		while (i < len && !isspace((unsigned char)str[i]))
 		{
 		    ++i;
 		}
@@ -57,7 +58,7 @@ namespace simgear {
 		{
 		    result.push_back( str.substr(j, i-j) );
 		    ++countsplit;
-		    while (i < len && isspace(str[i]))
+		    while (i < len && isspace((unsigned char)str[i]))
 		    {
 			++i;
 		    }
@@ -83,7 +84,7 @@ namespace simgear {
 		return split_whitespace( str, maxsplit );
 
 	    vector<string> result;
-	    int n = strlen( sep );
+	    int n = std::strlen( sep );
 	    if (n == 0)
 	    {
 		// Error: empty separator string
@@ -97,7 +98,7 @@ namespace simgear {
 
 	    while (i+n <= len)
 	    {
-		if (s[i] == sep[0] && (n == 1 || memcmp(s+i, sep, n) == 0))
+		if (s[i] == sep[0] && (n == 1 || std::memcmp(s+i, sep, n) == 0))
 		{
 		    result.push_back( str.substr(j,i-j) );
 		    i = j = i + n;