fixed c++11 functions

Author: DeRuina

cpp_module_06/ex00/ScalarConverter.cpp

@@ -35,7 +35,16 @@ void ScalarConverter::convert(std::string str)
   {
     try
     {
-      f = std::stof(str);
+		if (*(str.rbegin()) == 'f')
+		{
+			str.pop_back();
+			if (*(str.rbegin()) == 'f')
+				throw std::exception();
+		}
+		else
+			throw std::exception();
+		std::stringstream ss(str);
+		ss >> f;
     }
     catch (std::exception &e)
     {
@@ -50,7 +59,8 @@ void ScalarConverter::convert(std::string str)
   {
     try
     {
-      d = std::stod(str);
+       std::stringstream ss(str);
+		ss >> d;
     }
     catch (std::exception &e)
     {
@@ -61,9 +71,9 @@ void ScalarConverter::convert(std::string str)
     c = static_cast<char>(d);
     i = static_cast<int>(d);
   }
-  else if (str.length() == 1)
+  else if (str.length() == 1 && !std::isdigit(str.at(0)))
   {
-    c = str[0];
+    c = str.at(0);
     f = static_cast<float>(c);
     d = static_cast<double>(c);
     i = static_cast<int>(c);
@@ -72,7 +82,11 @@ void ScalarConverter::convert(std::string str)
   {
      try
     {
-      i = std::stoi(str);
+		if (!std::isdigit(str.at(0)) || std::atol(str.c_str()) > 2147483648)
+			throw std::exception();
+      std::stringstream ss(str);
+		ss >> i;
+
     }
     catch (std::exception &e)
     {
@@ -81,7 +95,7 @@ void ScalarConverter::convert(std::string str)
     }
     f = static_cast<float>(i);
     c = static_cast<char>(i);
-    d = static_cast<double>(d);
+    d = static_cast<double>(i);
   }
 
   if (print_c == false)
@@ -100,4 +114,4 @@ void ScalarConverter::convert(std::string str)
   std::cout << "Double is " << std::fixed << std::setprecision(1) << d << std::endl;
 
 
-}
+}

cpp_module_06/ex00/ScalarConverter.hpp

@@ -4,6 +4,7 @@
 #include <iostream>
 #include <string>
 #include <exception>
+#include <sstream>
 #include <limits>
 #include <iomanip>
 

cpp_module_06/ex02/Base.cpp

@@ -5,13 +5,13 @@ Base::~Base()
 
 Base *generate(void)
 {
-	static int i;
-	if (i % 3 == 0)
-		return (i++, new A());
-	else if (i % 3 == 1)
-		return (i++, new B());
-	else if (i % 3 == 2)
-		return (i++, new C());
+	int i = std::rand() % 3;
+	if (i == 0)
+		return (new A());
+	else if (i  == 1)
+		return (new B());
+	else if (i == 2)
+		return (new C());
 	return (NULL);
 }
 void identify(Base* p)

cpp_module_06/ex02/Base.hpp

@@ -3,6 +3,7 @@
 
 #include <iostream>
 #include <exception>
+#include <ctime>
 
 class Base
 {

cpp_module_06/ex02/main.cpp

@@ -2,6 +2,8 @@
 
 int main(void)
 {
+	std::srand(std::time(NULL));
+
 	Base *type1 = generate();
 	Base *type2 = generate();
 	Base *type3 = generate();