hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compile hashtable.c as C++

Browse Source
This commit is contained in:
Johan Wikman
2017-03-23 16:49:16 +02:00
parent 90f56e9dde
commit d257a8a905
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
server/core/CMakeLists.txt
View File

@ -10,7 +10,8 @@ add_library(maxscale-common SHARED
filter.cc
externcmd.cc
paths.cc
hashtable.c 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)
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)
if(WITH_JEMALLOC)
target_link_libraries(maxscale-common ${JEMALLOC_LIBRARIES})

2
server/core/hashtable.c → server/core/hashtable.cc
View File

@ -133,7 +133,7 @@ hashtable_alloc_real(HASHTABLE* target,
if (target == NULL)
{
if ((rval = MXS_MALLOC(sizeof(HASHTABLE))) == NULL)
if ((rval = (HASHTABLE*)MXS_MALLOC(sizeof(HASHTABLE))) == NULL)
{
return NULL;
}