summaryrefslogtreecommitdiffstats
path: root/src/misc_functions.h
diff options
context:
space:
mode:
authorErik Andersson <erik@packy.se>2016-11-22 23:56:43 +0100
committerErik Andersson <erik@packy.se>2016-11-22 23:56:43 +0100
commit41954fffc10bfd230f857f57c6871b412d5f2e91 (patch)
tree010bcf28f294a58b4a22b7276cf615758648bcbe /src/misc_functions.h
parented374a8dbcdaaf273964293d2805bdd61b148022 (diff)
downloadocelot-master.zip
ocelot-master.tar.gz
ocelot-master.tar.bz2
Ocelot v1.0HEADv1.0master
Diffstat (limited to 'src/misc_functions.h')
-rw-r--r--src/misc_functions.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/misc_functions.h b/src/misc_functions.h
index c9a24d3..fbe164d 100644
--- a/src/misc_functions.h
+++ b/src/misc_functions.h
@@ -1,12 +1,11 @@
#ifndef MISC_FUNCTIONS__H
#define MISC_FUNCTIONS__H
#include <string>
-#include <cstdlib>
-long strtolong(const std::string& str);
-int64_t strtolonglong(const std::string& str);
+
+int32_t strtoint32(const std::string& str);
+int64_t strtoint64(const std::string& str);
std::string inttostr(int i);
std::string hex_decode(const std::string &in);
std::string bintohex(const std::string &in);
-int timeval_subtract (timeval* result, timeval* x, timeval* y);
#endif