X-Git-Url: https://git.blender.org/gitweb/gitweb.cgi/blender-staging.git/blobdiff_plain/12315f4d0e0ae993805f141f64cb8c73c5297311..73c8d76ba406a7753b8b6aaa1e304d9e311f816a:/intern/string/STR_String.h

diff --git a/intern/string/STR_String.h b/intern/string/STR_String.h
index 78bef5f6728..ec945c80c7c 100644
--- a/intern/string/STR_String.h
+++ b/intern/string/STR_String.h
@@ -1,14 +1,11 @@
 /**
  * $Id$
- * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
+ * ***** BEGIN GPL LICENSE BLOCK *****
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version. The Blender
- * Foundation also sells licenses for use in proprietary software under
- * the Blender License.  See http://www.blender.org/BL/ for information
- * about this.
+ * of the License, or (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -26,7 +23,7 @@
  *
  * Contributor(s): none yet.
  *
- * ***** END GPL/BL DUAL LICENSE BLOCK *****
+ * ***** END GPL LICENSE BLOCK *****
  */
 
 /**
@@ -47,6 +44,10 @@
 
 #include <vector>
 #include <limits.h>
+
+#include <cstring>
+#include <cstdlib>
+
 using namespace std;
 
 
@@ -141,7 +142,7 @@ public:
 	inline operator const char *() const								{ return pData; }
 	inline char *Ptr()													{ return pData; }
 	inline const char *ReadPtr() const									{ return pData; }
-	inline float	ToFloat() const										{ return (float) atof(pData); }
+	inline float	ToFloat() const										{ float x=atof(pData); return x; }
 	inline int		ToInt() const										{ return atoi(pData); }
 
 	// Operators
@@ -200,3 +201,4 @@ inline  STR_String operator+(const char  *lhs, rcSTR_String   rhs)	{ return STR_
 
 
 #endif //_STR_String_H_
+