diff options
Diffstat (limited to '3rdparty/lzma/CPP/Common/StringToInt.h')
-rw-r--r-- | 3rdparty/lzma/CPP/Common/StringToInt.h | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/3rdparty/lzma/CPP/Common/StringToInt.h b/3rdparty/lzma/CPP/Common/StringToInt.h index cd99f17e6a0..5c5d7d7fe75 100644 --- a/3rdparty/lzma/CPP/Common/StringToInt.h +++ b/3rdparty/lzma/CPP/Common/StringToInt.h @@ -3,14 +3,19 @@ #ifndef __COMMON_STRING_TO_INT_H #define __COMMON_STRING_TO_INT_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); -Int64 ConvertStringToInt64(const wchar_t *s, const wchar_t **end); +Int32 ConvertStringToInt32(const wchar_t *s, const wchar_t **end) throw(); + +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 |