Changeset 247 for cpp/frams/util/sstring.h

Timestamp:

11/07/14 17:51:01 (9 years ago)

Author:

Maciej Komosinski

Message:

Sources support both 32-bit and 64-bit, and more compilers

File:

• cpp/frams/util/sstring.h (modified) (4 diffs)

cpp/frams/util/sstring.h

@@ -22 +22 @@
 // - mutex required to be thread safe
 
+#include <stdint.h>
 #include <string.h>
 #include <stdlib.h>
@@ -47 +48 @@
 SBuf();
 ~SBuf();
-unsigned long hash() const; // 32-bit FNV-1 hash -> http://en.wikipedia.org/wiki/Fowler_Noll_Vo_hash
+uint32_t hash() const; // 32-bit FNV-1 hash -> http://en.wikipedia.org/wiki/Fowler_Noll_Vo_hash
 };
 
@@ -155 +156 @@
 void operator+=(const SString&); ///< append other SString
 
-int equals(const SString &s) const; ///< TRUE if equal
-int operator==(const SString &s) const {return equals(s);} ///< TRUE if equal
-int operator!=(const SString &s) const {return !equals(s);}
+bool equals(const SString &s) const; ///< TRUE if equal
+bool operator==(const SString &s) const {return equals(s);} ///< TRUE if equal
+bool operator!=(const SString &s) const {return !equals(s);}
 const char* operator()(int p) const {return buf->txt+p;} ///< pointer to p'th character in SString
 char operator[](int i) const {return buf->txt[i];} ///< get char like in array
@@ -175 +176 @@
 int startsWith(const char *pattern) const;
 char charAt(int pos) const {return buf->txt[pos];}
-unsigned long hash() const {return buf->hash();}
+uint32_t hash() const {return buf->hash();}
 
 static SString valueOf(int);