Changeset 1339

Timestamp:

05/06/25 23:04:33 (2 days ago)

Author:

Maciej Komosinski

Message:

Added two helper conversion functions: toDouble(), toUInt()

Location:

cpp/common

Files:

• Convert.cpp (modified) (2 diffs)
• Convert.h (modified) (3 diffs)

cpp/common/Convert.cpp

@@ -18 +18 @@
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <locale>
 #include <iostream>
@@ -25 +26 @@
 
 int Convert::toInt(string s) { return atoi(s.c_str()); }
+unsigned int Convert::toUInt(string s)
+{
+        const char* begin = s.c_str();
+        char *end;
+        unsigned int value = strtoul(begin, &end, 10);
+        return (end == begin) ? 0 : value;
+}
 int Convert::toInt_HexIf0x(string s) { return (s.size() > 2 && s[0] == '0' && s[1] == 'x') ? (int)hexToInt(s.substr(2)) : atoi(s.c_str()); }
 float Convert::toFloat(string s) { return (float)atof(s.c_str()); }
+double Convert::toDouble(string s) { return atof(s.c_str()); }
 string Convert::toLowerCase(string s) { std::transform(s.begin(), s.end(), s.begin(), ::tolower);  return s; }
 string Convert::toUpperCase(string s) { std::transform(s.begin(), s.end(), s.begin(), ::toupper);  return s; }

cpp/common/Convert.h

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2020  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2025  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -12 +12 @@
 #include <cmath>
 
-#ifdef LINUX
-#define UINT64_FORMAT "%llu" //we want to avoid this and ambiguous "long long", but gcc does not seem to support I64u (yet?)
-#else
-#define UINT64_FORMAT "%I64u"
-#endif
 
 struct Convert
@@ -22 +17 @@
 public:
         static int toInt(string s);
+        static unsigned int toUInt(string s);
         static int toInt_HexIf0x(string s);
         static float toFloat(string s);
+        static double toDouble(string s);
         static string toLowerCase(string s);
         static string toUpperCase(string s);