diff options
Diffstat (limited to 'src/lib/util/hashing.h')
-rw-r--r-- | src/lib/util/hashing.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/lib/util/hashing.h b/src/lib/util/hashing.h index 78e02c6e145..b0de6a5c3c8 100644 --- a/src/lib/util/hashing.h +++ b/src/lib/util/hashing.h @@ -14,7 +14,8 @@ #define __HASHING_H__ #include "osdcore.h" -#include "astring.h" +#include "corestr.h" +#include <string> #include "md5.h" #include "sha1.h" @@ -33,7 +34,7 @@ struct sha1_t bool operator!=(const sha1_t &rhs) const { return memcmp(m_raw, rhs.m_raw, sizeof(m_raw)) != 0; } operator UINT8 *() { return m_raw; } bool from_string(const char *string, int length = -1); - const char *as_string(astring &buffer) const; + const char *as_string(std::string &buffer) const; UINT8 m_raw[20]; static const sha1_t null; }; @@ -84,7 +85,7 @@ struct md5_t bool operator!=(const md5_t &rhs) const { return memcmp(m_raw, rhs.m_raw, sizeof(m_raw)) != 0; } operator UINT8 *() { return m_raw; } bool from_string(const char *string, int length = -1); - const char *as_string(astring &buffer) const; + const char *as_string(std::string &buffer) const; UINT8 m_raw[16]; static const md5_t null; }; @@ -135,7 +136,7 @@ struct crc32_t crc32_t &operator=(const UINT32 crc) { m_raw = crc; return *this; } operator UINT32() const { return m_raw; } bool from_string(const char *string, int length = -1); - const char *as_string(astring &buffer) const; + const char *as_string(std::string &buffer) const; UINT32 m_raw; static const crc32_t null; }; @@ -181,7 +182,7 @@ struct crc16_t crc16_t &operator=(const UINT16 crc) { m_raw = crc; return *this; } operator UINT16() const { return m_raw; } bool from_string(const char *string, int length = -1); - const char *as_string(astring &buffer) const; + const char *as_string(std::string &buffer) const; UINT16 m_raw; static const crc16_t null; }; |