From fa06c11b1ef46c544bcdd96d61674093882f5c3d Mon Sep 17 00:00:00 2001 From: Andrey Semashev Date: Mon, 1 Jun 2015 00:46:50 +0300 Subject: [PATCH 1/4] Fix compilation error in GNU gettext backend Eventually, hash_function gets instantiated on wchar_t by create_messages_facet(). The pointer conversion has to be a reinterpret_cast instead of static_cast. --- src/shared/message.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/shared/message.cpp b/src/shared/message.cpp index 56a4fdc..034c5e7 100644 --- a/src/shared/message.cpp +++ b/src/shared/message.cpp @@ -436,8 +436,8 @@ namespace boost { while(*e) e++; state = pj_winberger_hash::update_state(state, - static_cast(p), - static_cast(e)); + reinterpret_cast(p), + reinterpret_cast(e)); state = pj_winberger_hash::update_state(state,'\4'); } p = msg.key(); @@ -445,8 +445,8 @@ namespace boost { while(*e) e++; state = pj_winberger_hash::update_state(state, - static_cast(p), - static_cast(e)); + reinterpret_cast(p), + reinterpret_cast(e)); return state; } }; From f41ff6d8180a2e66670700a43d2fd9891450b425 Mon Sep 17 00:00:00 2001 From: Andrey Semashev Date: Mon, 1 Jun 2015 01:14:32 +0300 Subject: [PATCH 2/4] Add a missing include --- src/shared/message.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/shared/message.cpp b/src/shared/message.cpp index 034c5e7..53416fd 100644 --- a/src/shared/message.cpp +++ b/src/shared/message.cpp @@ -22,10 +22,9 @@ #ifdef BOOST_LOCALE_UNORDERED_CATALOG #include -#else -#include #endif +#include #include From 1020c9c19bcbf2535e0795d4b8c9a9435d4aa6e0 Mon Sep 17 00:00:00 2001 From: Andrey Semashev Date: Tue, 14 Jul 2015 11:09:45 +0300 Subject: [PATCH 3/4] Added more missing includes. --- src/shared/message.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/shared/message.cpp b/src/shared/message.cpp index 53416fd..46f85ec 100644 --- a/src/shared/message.cpp +++ b/src/shared/message.cpp @@ -10,6 +10,7 @@ #include #include #include +#include #include #ifdef BOOST_MSVC # pragma warning(disable : 4996) @@ -25,12 +26,19 @@ #endif #include +#include +#include +#include +#include #include +#include +#include #include "mo_hash.hpp" #include "mo_lambda.hpp" +#include #include #include From 0bbcbe30f57cac6f61632a145275d94b56166d98 Mon Sep 17 00:00:00 2001 From: Andrey Semashev Date: Tue, 14 Jul 2015 11:27:41 +0300 Subject: [PATCH 4/4] Yet another missing include. --- src/shared/message.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/shared/message.cpp b/src/shared/message.cpp index 46f85ec..d4b89a5 100644 --- a/src/shared/message.cpp +++ b/src/shared/message.cpp @@ -6,6 +6,7 @@ // http://www.boost.org/LICENSE_1_0.txt) // #define BOOST_LOCALE_SOURCE +#include #include #include #include