Mercurial > botc / file diff

--- a/src/str.h	Sun Jan 19 20:39:30 2014 +0200
+++ b/src/str.h	Sun Jan 26 23:18:48 2014 +0200
@@ -82,9 +82,9 @@
 		bool               starts_with (const string& other);
 		string             strip (list< char > unwanted);
 		string             substring (long a, long b = -1) const;
-		double             to_double (bool* ok = null) const;
-		float              to_float (bool* ok = null) const;
-		long               to_long (bool* ok = null, int base = 10) const;
+		double             to_double (bool* ok = nullptr) const;
+		float              to_float (bool* ok = nullptr) const;
+		long               to_long (bool* ok = nullptr, int base = 10) const;
 		void               trim (length_type n);
 		string             to_uppercase() const;
 
@@ -173,11 +173,6 @@
 			m_string.insert (m_string.begin() + pos, c);
 		}
 
-		inline length_type len() const
-		{
-			return length();
-		}
-
 		inline length_type length() const
 		{
 			return m_string.length();