From b3c3dd8c3fa40dbe037c60e215fae713653bea7d Mon Sep 17 00:00:00 2001
From: Tomasz Sowa <t.sowa@ttmath.org>
Date: Wed, 18 Aug 2010 09:22:38 +0000
Subject: [PATCH] fixed: recurrence calling in Big::FromString(const
 std::string &, uint, const wchar_t **, bool *) it should have the signature:
 Big::FromString(const std::string &, uint, const char **, bool *)

git-svn-id: svn://ttmath.org/publicrep/ttmath/trunk@301 e52654a7-88a9-db11-a3e9-0013d4bc506e
---
 ttmath/ttmathbig.h | 64 +++++++++++++++++++++++-----------------------
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/ttmath/ttmathbig.h b/ttmath/ttmathbig.h
index c8e9ae1..e58c894 100644
--- a/ttmath/ttmathbig.h
+++ b/ttmath/ttmathbig.h
@@ -1320,6 +1320,8 @@ public:
 		if( IsZero() )
 			return 0;
 
+		// !! this two loops can be joined together
+
 		for(i=0 ; i<man ; ++i)
 		{
 			man1.table[i+man] = mantissa.table[i];
@@ -1410,8 +1412,6 @@ public:
 	}
 
 
-
-
 	/*!
 		power this = this ^ pow
 		(pow without a sign)
@@ -3455,7 +3455,7 @@ private:
 
 		if( base==10 && man<=TTMATH_BUILTIN_VARIABLES_SIZE )
 		{
-			// for the base equal 10 we're using SelLn10() instead of calculating it
+			// for the base equal 10 we're using SetLn10() instead of calculating it
 			// (only if we have the constant sufficient big)
 			temp.SetLn10();
 		}
@@ -4220,6 +4220,35 @@ public:
 	}
 
 
+	/*!
+		a method for converting a string into its value
+	*/
+	uint FromString(const char * source, const Conv & conv, const char ** after_source = 0, bool * value_read = 0)
+	{
+		return FromStringBase(source, conv, after_source, value_read);
+	}
+
+
+	/*!
+		a method for converting a string into its value		
+	*/
+	uint FromString(const std::string & string, uint base = 10, const char ** after_source = 0, bool * value_read = 0)
+	{
+		return FromString(string.c_str(), base, after_source, value_read);
+	}
+
+
+	/*!
+		a method for converting a string into its value		
+	*/
+	uint FromString(const std::string & string, const Conv & conv, const char ** after_source = 0, bool * value_read = 0)
+	{
+		return FromString(string.c_str(), conv, after_source, value_read);
+	}
+
+
+#ifndef TTMATH_DONT_USE_WCHAR
+
 	/*!
 		a method for converting a string into its value
 	*/
@@ -4232,15 +4261,6 @@ public:
 	}
 
 
-	/*!
-		a method for converting a string into its value
-	*/
-	uint FromString(const char * source, const Conv & conv, const char ** after_source = 0, bool * value_read = 0)
-	{
-		return FromStringBase(source, conv, after_source, value_read);
-	}
-
-
 	/*!
 		a method for converting a string into its value
 	*/
@@ -4250,26 +4270,6 @@ public:
 	}
 
 
-	/*!
-		a method for converting a string into its value		
-	*/
-	uint FromString(const std::string & string, uint base = 10, const wchar_t ** after_source = 0, bool * value_read = 0)
-	{
-		return FromString(string.c_str(), base, after_source, value_read);
-	}
-
-
-	/*!
-		a method for converting a string into its value		
-	*/
-	uint FromString(const std::string & string, const Conv & conv, const wchar_t ** after_source = 0, bool * value_read = 0)
-	{
-		return FromString(string.c_str(), conv, after_source, value_read);
-	}
-
-
-#ifndef TTMATH_DONT_USE_WCHAR
-
 	/*!
 		a method for converting a string into its value		
 	*/