From 6e6375ee41815f6864454c0819b1007179fd43d6 Mon Sep 17 00:00:00 2001
From: Jan Travnicek <Jan.Travnicek@fit.cvut.cz>
Date: Sat, 4 Mar 2017 21:31:41 +0100
Subject: [PATCH] normalize api of all string to integral functions
---
alib2std/src/extensions/string.cpp | 20 ++++++++++++++++++++
alib2std/src/extensions/string.hpp | 2 +-
alib2std/src/string | 2 ++
3 files changed, 23 insertions(+), 1 deletion(-)
diff --git a/alib2std/src/extensions/string.cpp b/alib2std/src/extensions/string.cpp
index edcfa3859b..3914389ab0 100644
--- a/alib2std/src/extensions/string.cpp
+++ b/alib2std/src/extensions/string.cpp
@@ -25,11 +25,31 @@ int from_string ( const string & value ) {
return stoi__private ( value.c_str() );
}
+template < >
+long from_string ( const string & value ) {
+ return stol__private ( value.c_str() );
+}
+
+template < >
+long long from_string ( const string & value ) {
+ return stoll__private ( value.c_str() );
+}
+
template < >
unsigned from_string ( const string & value ) {
return stoul__private ( value.c_str() );
}
+template < >
+unsigned long from_string ( const string & value ) {
+ return stoul__private ( value.c_str() );
+}
+
+template < >
+unsigned long long from_string ( const string & value ) {
+ return stoull__private ( value.c_str() );
+}
+
string cstringToString ( char * param ) {
string res ( param );
diff --git a/alib2std/src/extensions/string.hpp b/alib2std/src/extensions/string.hpp
index 05f2d6792b..e8d2714698 100644
--- a/alib2std/src/extensions/string.hpp
+++ b/alib2std/src/extensions/string.hpp
@@ -1,5 +1,5 @@
/*
- * string.cpp
+ * string.hpp
*
* Created on: Apr 1, 2013
* Author: Jan Travnicek
diff --git a/alib2std/src/string b/alib2std/src/string
index a1276e2881..811fb6c3d9 100644
--- a/alib2std/src/string
+++ b/alib2std/src/string
@@ -3,6 +3,7 @@
#define stoi stoi__private
#define stol stol__private
+#define stoll stoll__private
#define stoul stoul__private
#define stoull stoull__private
#define to_string to_string__private
@@ -11,6 +12,7 @@
#undef stoi
#undef stol
+#undef stoll
#undef stoul
#undef stoull
#undef to_string
--
GitLab