aboutsummaryrefslogtreecommitdiff
path: root/CPP/Common/StringToInt.h
diff options
context:
space:
mode:
Diffstat (limited to 'CPP/Common/StringToInt.h')
-rw-r--r--[-rwxr-xr-x]CPP/Common/StringToInt.h23
1 files changed, 13 insertions, 10 deletions
diff --git a/CPP/Common/StringToInt.h b/CPP/Common/StringToInt.h
index 16a1a4f..140d1ee 100755..100644
--- a/CPP/Common/StringToInt.h
+++ b/CPP/Common/StringToInt.h
@@ -1,18 +1,21 @@
// Common/StringToInt.h
-#ifndef __COMMON_STRINGTOINT_H
-#define __COMMON_STRINGTOINT_H
+#ifndef __COMMON_STRING_TO_INT_H
+#define __COMMON_STRING_TO_INT_H
-#include <string.h>
-#include "Types.h"
+#include "MyTypes.h"
-UInt64 ConvertStringToUInt64(const char *s, const char **end);
-UInt64 ConvertOctStringToUInt64(const char *s, const char **end);
-UInt64 ConvertHexStringToUInt64(const char *s, const char **end);
-UInt64 ConvertStringToUInt64(const wchar_t *s, const wchar_t **end);
+UInt32 ConvertStringToUInt32(const char *s, const char **end) throw();
+UInt64 ConvertStringToUInt64(const char *s, const char **end) throw();
+UInt32 ConvertStringToUInt32(const wchar_t *s, const wchar_t **end) throw();
+UInt64 ConvertStringToUInt64(const wchar_t *s, const wchar_t **end) throw();
-Int64 ConvertStringToInt64(const char *s, const char **end);
+Int32 ConvertStringToInt32(const wchar_t *s, const wchar_t **end) throw();
-#endif
+UInt32 ConvertOctStringToUInt32(const char *s, const char **end) throw();
+UInt64 ConvertOctStringToUInt64(const char *s, const char **end) throw();
+UInt32 ConvertHexStringToUInt32(const char *s, const char **end) throw();
+UInt64 ConvertHexStringToUInt64(const char *s, const char **end) throw();
+#endif