From ebf22eee8fe84b3d556a7f9dfcd8f5cf2d55e79e Mon Sep 17 00:00:00 2001 From: Johan Wikman Date: Thu, 23 Mar 2017 16:51:45 +0200 Subject: [PATCH] Compile hint.c as C++ --- server/core/CMakeLists.txt | 3 ++- server/core/{hint.c => hint.cc} | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) rename server/core/{hint.c => hint.cc} (96%) diff --git a/server/core/CMakeLists.txt b/server/core/CMakeLists.txt index 1bc808a95..0537cb016 100644 --- a/server/core/CMakeLists.txt +++ b/server/core/CMakeLists.txt @@ -11,7 +11,8 @@ add_library(maxscale-common SHARED externcmd.cc paths.cc hashtable.cc - hint.c housekeeper.c load_utils.c log_manager.cc maxscale_pcre2.c misc.c mlist.c modutil.c monitor.c queuemanager.c query_classifier.cc poll.c random_jkiss.c resultset.c router.cc secrets.c server.c service.c session.c spinlock.c thread.c users.c utils.c skygw_utils.cc statistics.c listener.c ssl.c mysql_utils.c mysql_binlog.c modulecmd.c) + hint.cc + housekeeper.c load_utils.c log_manager.cc maxscale_pcre2.c misc.c mlist.c modutil.c monitor.c queuemanager.c query_classifier.cc poll.c random_jkiss.c resultset.c router.cc secrets.c server.c service.c session.c spinlock.c thread.c users.c utils.c skygw_utils.cc statistics.c listener.c ssl.c mysql_utils.c mysql_binlog.c modulecmd.c) if(WITH_JEMALLOC) target_link_libraries(maxscale-common ${JEMALLOC_LIBRARIES}) diff --git a/server/core/hint.c b/server/core/hint.cc similarity index 96% rename from server/core/hint.c rename to server/core/hint.cc index dcb290f2b..08d4932be 100644 --- a/server/core/hint.c +++ b/server/core/hint.cc @@ -52,7 +52,7 @@ hint_dup(const HINT *hint) ptr2->type = ptr1->type; if (ptr1->data) { - ptr2->data = MXS_STRDUP_A(ptr1->data); + ptr2->data = MXS_STRDUP_A((const char*)ptr1->data); } else { @@ -60,7 +60,7 @@ hint_dup(const HINT *hint) } if (ptr1->value) { - ptr2->value = MXS_STRDUP_A(ptr1->value); + ptr2->value = MXS_STRDUP_A((const char*)ptr1->value); } else {