helpcompiler/inc/HelpCompiler.hxx | 27 ++-------------------------
helpcompiler/source/HelpLinker.cxx | 2 +-
2 files changed, 3 insertions(+), 26 deletions(-)
New commits:
commit 55783b8006a509dbdfe29a1bd5d86f26204b6a42
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Sun Apr 7 09:13:30 2019 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sun Apr 7 11:50:43 2019 +0200
std::string has a std::hash specialisation since C++11
Change-Id: I8cc01420d0235a8d1686881eca1ad9cc4a67ebe0
Reviewed-on: https://gerrit.libreoffice.org/70362
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/helpcompiler/inc/HelpCompiler.hxx
b/helpcompiler/inc/HelpCompiler.hxx
index 06521c97256e..ecd54ede9d0f 100644
--- a/helpcompiler/inc/HelpCompiler.hxx
+++ b/helpcompiler/inc/HelpCompiler.hxx
@@ -126,34 +126,11 @@ namespace fs
void copy(const fs::path &src, const fs::path &dest);
}
-struct joaat_hash
-{
- size_t operator()(const std::string &str) const
- {
- size_t hash = 0;
- const char *key = str.data();
- for (size_t i = 0; i < str.size(); i++)
- {
- hash += key[i];
- hash += (hash << 10);
- hash ^= (hash >> 6);
- }
- hash += (hash << 3);
- hash ^= (hash >> 11);
- hash += (hash << 15);
- return hash;
- }
-};
-
-#define get16bits(d) ((((sal_uInt32)(((const sal_uInt8 *)(d))[1])) << 8)\
- +(sal_uInt32)(((const sal_uInt8 *)(d))[0]) )
-
-#define pref_hash joaat_hash
-typedef std::unordered_map<std::string, std::string, pref_hash> Stringtable;
+typedef std::unordered_map<std::string, std::string> Stringtable;
typedef std::deque<std::string> LinkedList;
-typedef std::unordered_map<std::string, LinkedList, pref_hash> Hashtable;
+typedef std::unordered_map<std::string, LinkedList> Hashtable;
class StreamTable
{
diff --git a/helpcompiler/source/HelpLinker.cxx
b/helpcompiler/source/HelpLinker.cxx
index 86d2d254bef2..f32e242f0867 100644
--- a/helpcompiler/source/HelpLinker.cxx
+++ b/helpcompiler/source/HelpLinker.cxx
@@ -173,7 +173,7 @@ static void writeKeyValue_DBHelp( FILE* pFile, const
std::string& aKeyStr, const
class HelpKeyword
{
private:
- typedef std::unordered_map<std::string, Data, pref_hash> DataHashtable;
+ typedef std::unordered_map<std::string, Data> DataHashtable;
DataHashtable _hash;
public:
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
