Implement required code changes for common target to compile as C++

* Add casts where necessary mostly for void * -> any other type
* Replaced use of min, max, swap macros with std variant
* Fixed where `const char` strings were passed/stored to non-const variables
* Updated VECTOR_RESIZE with C++ variant that relays on decltype to make type safe cast from memory manager

Author: hemagx

3rdparty/mt19937ar/mt19937ar.h

@@ -43,6 +43,10 @@
    email: m-mat @ math.sci.hiroshima-u.ac.jp (remove space)
 */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* initializes mt[N] with a seed */
 void init_genrand(unsigned long s);
 
@@ -70,3 +74,7 @@ double genrand_real3(void);
 
 /* generates a random number on [0,1) with 53-bit resolution*/
 double genrand_res53(void);
+
+#ifdef __cplusplus
+}
+#endif

CMakeLists.txt

@@ -24,6 +24,9 @@ project(hercules LANGUAGES C CXX)
 set(CMAKE_C_STANDARD 11)
 set(CMAKE_C_STANDARD_REQUIRED ON)
 set(CMAKE_C_EXTENSIONS ON)
+set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS NO)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON CACHE BOOL "Enable compile commands" FORCE)
 if(NOT CMAKE_SYSTEM_NAME STREQUAL "Windows")
   set(CMAKE_INSTALL_LIBDIR "lib")
@@ -164,7 +167,7 @@ if(MSVC)
   add_compile_options(/wd4100) # Disable unused parameter warning mostly due to BUILDIN and similar functions having unused parameters
   add_compile_options(/wd4312) # Disable conversion to greater size warning (see 0xdeadbeef pointers)
   # Definations
-  add_compile_definitions(WIN32 _WIN32 __WIN32 _CRT_SECURE_NO_DEPRECATE _CRT_NONSTDC_NO_DEPRECATE FD_SETSIZE=4096 WIN32_LEAN_AND_MEAN)
+  add_compile_definitions(WIN32 _WIN32 __WIN32 _CRT_SECURE_NO_DEPRECATE _CRT_NONSTDC_NO_DEPRECATE FD_SETSIZE=4096 WIN32_LEAN_AND_MEAN NOMINMAX)
 else()
   # Check for mandatory compile flags
   include(CompilerFlagHelpers)

src/common/CMakeLists.txt

@@ -164,3 +164,5 @@ if(NOT CMAKE_SYSTEM_NAME STREQUAL "Windows")
 
   add_dependencies(common sysinfo)
 endif()
+
+set_source_files_properties(${COMMON_SRCS} PROPERTIES LANGUAGE CXX)

src/common/HPM.c

@@ -111,7 +111,7 @@ static void *hplugin_import_symbol(char *name, unsigned int pID)
 	if (i != VECTOR_LENGTH(HPM->symbols))
 		return VECTOR_INDEX(HPM->symbols, i)->ptr;
 
-	ShowError("HPM:get_symbol:%s: '"CL_WHITE"%s"CL_RESET"' not found!\n",HPM->pid2name(pID),name);
+	ShowError("HPM:get_symbol:%s: '" CL_WHITE "%s" CL_RESET "' not found!\n",HPM->pid2name(pID),name);
 	return NULL;
 }
 
@@ -243,11 +243,11 @@ static bool hplugin_data_store_validate(enum HPluginDataTypes type, struct hplug
 		case HPDT_UNIT_PARAMETER:
 		default:
 			if (HPM->data_store_validate_sub == NULL) {
-				ShowError("HPM:validateHPData failed, type %u needs sub-handler!\n", type);
+				ShowError("HPM:validateHPData failed, type %u needs sub-handler!\n", (unsigned int)type);
 				return false;
 			}
 			if (!HPM->data_store_validate_sub(type, storeptr, initialize)) {
-				ShowError("HPM:HPM:validateHPData failed, unknown type %u!\n", type);
+				ShowError("HPM:HPM:validateHPData failed, unknown type %u!\n", (unsigned int)type);
 				return false;
 			}
 			break;
@@ -257,7 +257,7 @@ static bool hplugin_data_store_validate(enum HPluginDataTypes type, struct hplug
 		store = *storeptr;
 	}
 	if (store->type != type) {
-		ShowError("HPM:HPM:validateHPData failed, store type mismatch %u != %u.\n", store->type, type);
+		ShowError("HPM:HPM:validateHPData failed, store type mismatch %u != %u.\n", (unsigned int)store->type, (unsigned int)type);
 		return false;
 	}
 	return true;
@@ -282,7 +282,7 @@ static void hplugins_addToHPData(enum HPluginDataTypes type, uint32 pluginID, st
 
 	if (!HPM->data_store_validate(type, storeptr, true)) {
 		/* woo it failed! */
-		ShowError("HPM:addToHPData:%s: failed, type %u (%u|%u)\n", HPM->pid2name(pluginID), type, pluginID, classid);
+		ShowError("HPM:addToHPData:%s: failed, type %u (%u|%u)\n", HPM->pid2name(pluginID), (unsigned int)type, pluginID, classid);
 		return;
 	}
 	store = *storeptr;
@@ -324,7 +324,7 @@ static void *hplugins_getFromHPData(enum HPluginDataTypes type, uint32 pluginID,
 
 	if (!HPM->data_store_validate(type, &store, false)) {
 		/* woo it failed! */
-		ShowError("HPM:getFromHPData:%s: failed, type %u (%u|%u)\n", HPM->pid2name(pluginID), type, pluginID, classid);
+		ShowError("HPM:getFromHPData:%s: failed, type %u (%u|%u)\n", HPM->pid2name(pluginID), (unsigned int)type, pluginID, classid);
 		return NULL;
 	}
 	if (!store)
@@ -352,7 +352,7 @@ static void hplugins_removeFromHPData(enum HPluginDataTypes type, uint32 pluginI
 
 	if (!HPM->data_store_validate(type, &store, false)) {
 		/* woo it failed! */
-		ShowError("HPM:removeFromHPData:%s: failed, type %u (%u|%u)\n", HPM->pid2name(pluginID), type, pluginID, classid);
+		ShowError("HPM:removeFromHPData:%s: failed, type %u (%u|%u)\n", HPM->pid2name(pluginID), (unsigned int)type, pluginID, classid);
 		return;
 	}
 	if (!store)
@@ -451,7 +451,7 @@ static bool hplugins_addconf(unsigned int pluginID, enum HPluginConfType type, c
 	}
 
 	if (type >= HPCT_MAX) {
-		ShowError("HPM->addConf:%s: unknown point '%u' specified for config '%s'\n",HPM->pid2name(pluginID),type,name);
+		ShowError("HPM->addConf:%s: unknown point '%u' specified for config '%s'\n", HPM->pid2name(pluginID), (unsigned int)type, name);
 		return false;
 	}
 
@@ -494,20 +494,20 @@ static struct hplugin *hplugin_load(const char *filename)
 	const char *(*HPMLoadEvent)(int server_type);
 
 	if( HPM->exists(filename) ) {
-		ShowWarning("HPM:plugin_load: attempting to load duplicate '"CL_WHITE"%s"CL_RESET"', skipping...\n", filename);
+		ShowWarning("HPM:plugin_load: attempting to load duplicate '" CL_WHITE "%s" CL_RESET "', skipping...\n", filename);
 		return NULL;
 	}
 
 	plugin = HPM->create();
 
 	if (!(plugin->dll = plugin_open(filename))) {
 		char buf[1024];
-		ShowFatalError("HPM:plugin_load: failed to load '"CL_WHITE"%s"CL_RESET"' (error: %s)!\n", filename, plugin_geterror(buf));
+		ShowFatalError("HPM:plugin_load: failed to load '" CL_WHITE "%s" CL_RESET "' (error: %s)!\n", filename, plugin_geterror(buf));
 		exit(EXIT_FAILURE);
 	}
 
 	if( !( info = plugin_import(plugin->dll, "pinfo",struct hplugin_info*) ) ) {
-		ShowFatalError("HPM:plugin_load: failed to retrieve 'plugin_info' for '"CL_WHITE"%s"CL_RESET"'!\n", filename);
+		ShowFatalError("HPM:plugin_load: failed to retrieve 'plugin_info' for '" CL_WHITE "%s" CL_RESET "'!\n", filename);
 		exit(EXIT_FAILURE);
 	}
 
@@ -517,27 +517,27 @@ static struct hplugin *hplugin_load(const char *filename)
 	}
 
 	if( !HPM->iscompatible(info->req_version) ) {
-		ShowFatalError("HPM:plugin_load: '"CL_WHITE"%s"CL_RESET"' incompatible version '%s' -> '%s'!\n", filename, info->req_version, HPM_VERSION);
+		ShowFatalError("HPM:plugin_load: '" CL_WHITE "%s" CL_RESET "' incompatible version '%s' -> '%s'!\n", filename, info->req_version, HPM_VERSION);
 		exit(EXIT_FAILURE);
 	}
 
 	plugin->info = info;
 	plugin->filename = aStrdup(filename);
 
 	if ((import_symbol_ref = plugin_import(plugin->dll, "import_symbol", ImportSymbolFunc **)) == NULL) {
-		ShowFatalError("HPM:plugin_load: failed to retrieve 'import_symbol' for '"CL_WHITE"%s"CL_RESET"'!\n", filename);
+		ShowFatalError("HPM:plugin_load: failed to retrieve 'import_symbol' for '" CL_WHITE "%s" CL_RESET "'!\n", filename);
 		exit(EXIT_FAILURE);
 	}
 
 	*import_symbol_ref = HPM->import_symbol;
 
 	if( !( HPMi = plugin_import(plugin->dll, "HPMi",struct HPMi_interface **) ) ) {
-		ShowFatalError("HPM:plugin_load: failed to retrieve 'HPMi' for '"CL_WHITE"%s"CL_RESET"'!\n", filename);
+		ShowFatalError("HPM:plugin_load: failed to retrieve 'HPMi' for '" CL_WHITE "%s" CL_RESET "'!\n", filename);
 		exit(EXIT_FAILURE);
 	}
 
 	if( !( *HPMi = plugin_import(plugin->dll, "HPMi_s",struct HPMi_interface *) ) ) {
-		ShowFatalError("HPM:plugin_load: failed to retrieve 'HPMi_s' for '"CL_WHITE"%s"CL_RESET"'!\n", filename);
+		ShowFatalError("HPM:plugin_load: failed to retrieve 'HPMi_s' for '" CL_WHITE "%s" CL_RESET "'!\n", filename);
 		exit(EXIT_FAILURE);
 	}
 	plugin->hpi = *HPMi;
@@ -558,40 +558,40 @@ static struct hplugin *hplugin_load(const char *filename)
 		anyEvent = true;
 
 	if( !anyEvent ) {
-		ShowWarning("HPM:plugin_load: no events found for '"CL_WHITE"%s"CL_RESET"'!\n", filename);
+		ShowWarning("HPM:plugin_load: no events found for '" CL_WHITE "%s" CL_RESET "'!\n", filename);
 		exit(EXIT_FAILURE);
 	}
 
 	if (!(HPMLoadEvent = plugin_import(plugin->dll, "HPM_shared_symbols", const char *(*)(int)))) {
-		ShowFatalError("HPM:plugin_load: failed to retrieve 'HPM_shared_symbols' for '"CL_WHITE"%s"CL_RESET"', most likely not including HPMDataCheck.h!\n", filename);
+		ShowFatalError("HPM:plugin_load: failed to retrieve 'HPM_shared_symbols' for '" CL_WHITE "%s" CL_RESET "', most likely not including HPMDataCheck.h!\n", filename);
 		exit(EXIT_FAILURE);
 	}
 	{
 		const char *failure = HPMLoadEvent(SERVER_TYPE);
 		if (failure) {
-			ShowFatalError("HPM:plugin_load: failed to import symbol '%s' into '"CL_WHITE"%s"CL_RESET"'.\n", failure, filename);
+			ShowFatalError("HPM:plugin_load: failed to import symbol '%s' into '" CL_WHITE "%s" CL_RESET "'.\n", failure, filename);
 			exit(EXIT_FAILURE);
 		}
 	}
 
 	if( !( HPMDataCheckLen = plugin_import(plugin->dll, "HPMDataCheckLen", unsigned int *) ) ) {
-		ShowFatalError("HPM:plugin_load: failed to retrieve 'HPMDataCheckLen' for '"CL_WHITE"%s"CL_RESET"', most likely not including HPMDataCheck.h!\n", filename);
+		ShowFatalError("HPM:plugin_load: failed to retrieve 'HPMDataCheckLen' for '" CL_WHITE "%s" CL_RESET "', most likely not including HPMDataCheck.h!\n", filename);
 		exit(EXIT_FAILURE);
 	}
 
 	if( !( HPMDataCheckVer = plugin_import(plugin->dll, "HPMDataCheckVer", int *) ) ) {
-		ShowFatalError("HPM:plugin_load: failed to retrieve 'HPMDataCheckVer' for '"CL_WHITE"%s"CL_RESET"', most likely an outdated plugin!\n", filename);
+		ShowFatalError("HPM:plugin_load: failed to retrieve 'HPMDataCheckVer' for '" CL_WHITE "%s" CL_RESET "', most likely an outdated plugin!\n", filename);
 		exit(EXIT_FAILURE);
 	}
 
 	if( !( HPMDataCheck = plugin_import(plugin->dll, "HPMDataCheck", struct s_HPMDataCheck *) ) ) {
-		ShowFatalError("HPM:plugin_load: failed to retrieve 'HPMDataCheck' for '"CL_WHITE"%s"CL_RESET"', most likely not including HPMDataCheck.h!\n", filename);
+		ShowFatalError("HPM:plugin_load: failed to retrieve 'HPMDataCheck' for '" CL_WHITE "%s" CL_RESET "', most likely not including HPMDataCheck.h!\n", filename);
 		exit(EXIT_FAILURE);
 	}
 
 	// TODO: Remove the HPM->DataCheck != NULL check once login and char support is complete
 	if (HPM->DataCheck != NULL && !HPM->DataCheck(HPMDataCheck,*HPMDataCheckLen,*HPMDataCheckVer,plugin->info->name)) {
-		ShowFatalError("HPM:plugin_load: '"CL_WHITE"%s"CL_RESET"' failed DataCheck, out of sync from the core (recompile plugin)!\n", filename);
+		ShowFatalError("HPM:plugin_load: '" CL_WHITE "%s" CL_RESET "' failed DataCheck, out of sync from the core (recompile plugin)!\n", filename);
 		exit(EXIT_FAILURE);
 	}
 
@@ -617,7 +617,7 @@ static struct hplugin *hplugin_load(const char *filename)
 	if( HPM->load_sub )
 		HPM->load_sub(plugin);
 
-	ShowStatus("HPM: Loaded plugin '"CL_WHITE"%s"CL_RESET"' (%s)%s.\n",
+	ShowStatus("HPM: Loaded plugin '" CL_WHITE "%s" CL_RESET "' (%s)%s.\n",
 			plugin->info->name, plugin->info->version,
 			plugin->hpi->hooking != NULL ? " built with HPMHooking support" : "");
 
@@ -725,7 +725,7 @@ static void hplugins_config_read(void)
 					 && (addhook_sub = plugin_import(plugin->dll, "HPM_Plugin_AddHook",bool (*)(enum HPluginHookType, const char *, void *, unsigned int))) != NULL) {
 						const char *failed = func(&HPM->hooking->force_return);
 						if (failed) {
-							ShowError("HPM: failed to retrieve '%s' for '"CL_WHITE"%s"CL_RESET"'!\n", failed, plugin_name);
+							ShowError("HPM: failed to retrieve '%s' for '" CL_WHITE "%s" CL_RESET "'!\n", failed, plugin_name);
 						} else {
 							HPM->hooking->enabled = true;
 							HPM->hooking->addhook_sub = addhook_sub;
@@ -747,7 +747,7 @@ static void hplugins_config_read(void)
 	aFree(base_path);
 
 	if (VECTOR_LENGTH(HPM->plugins))
-		ShowStatus("HPM: There are '"CL_WHITE"%d"CL_RESET"' plugins loaded, type '"CL_WHITE"plugins"CL_RESET"' to list them\n", VECTOR_LENGTH(HPM->plugins));
+		ShowStatus("HPM: There are '" CL_WHITE "%d" CL_RESET "' plugins loaded, type '" CL_WHITE "plugins" CL_RESET "' to list them\n", VECTOR_LENGTH(HPM->plugins));
 }
 
 /**
@@ -766,11 +766,11 @@ static CPCMD(plugins)
 		return;
 	}
 
-	ShowInfo("HPC: There are '"CL_WHITE"%d"CL_RESET"' plugins loaded\n", VECTOR_LENGTH(HPM->plugins));
+	ShowInfo("HPC: There are '" CL_WHITE "%d" CL_RESET "' plugins loaded\n", VECTOR_LENGTH(HPM->plugins));
 
 	for(i = 0; i < VECTOR_LENGTH(HPM->plugins); i++) {
 		struct hplugin *plugin = VECTOR_INDEX(HPM->plugins, i);
-		ShowInfo("HPC: - '"CL_WHITE"%s"CL_RESET"' (%s)\n", plugin->info->name, plugin->filename);
+		ShowInfo("HPC: - '" CL_WHITE "%s" CL_RESET "' (%s)\n", plugin->info->name, plugin->filename);
 	}
 }
 
@@ -815,7 +815,7 @@ static unsigned char hplugins_parse_packets(int fd, int packet_id, enum HPluginP
  * @retval "core" if the plugin ID belongs to the Hercules core.
  * @retval "UnknownPlugin" if the plugin wasn't found.
  */
-static char *hplugins_id2name(unsigned int pid)
+static const char *hplugins_id2name(unsigned int pid)
 {
 	int i;
 
@@ -852,7 +852,7 @@ static const char *HPM_file2ptr(const char *file)
 	}
 
 	/* we handle this memory outside of the server's memory manager because we need it to exist after the memory manager goes down */
-	HPM->filenames.data = realloc(HPM->filenames.data, (++HPM->filenames.count)*sizeof(struct HPMFileNameCache));
+	HPM->filenames.data = (struct HPMFileNameCache *)realloc(HPM->filenames.data, (++HPM->filenames.count)*sizeof(struct HPMFileNameCache));
 
 	HPM->filenames.data[i].addr = file;
 	HPM->filenames.data[i].name = strdup(file);

src/common/HPM.h

@@ -155,7 +155,7 @@ struct HPM_interface {
 	void (*share) (void *value, const char *name);
 	void (*config_read) (void);
 	bool (*parse_battle_conf) (const struct config_t *config, const char *filename, bool imported);
-	char *(*pid2name) (unsigned int pid);
+	const char *(*pid2name) (unsigned int pid);
 	unsigned char (*parse_packets) (int fd, int packet_id, enum HPluginPacketHookingPoints point);
 	void (*load_sub) (struct hplugin *plugin);
 	/* for custom config parsing */
@@ -177,10 +177,18 @@ struct HPM_interface {
 	struct HPMHooking_core_interface *hooking;
 };
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 CMDLINEARG(loadplugin);
 
 extern struct HPM_interface *HPM;
 
 void hpm_defaults(void);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* COMMON_HPM_H */

src/common/HPMi.h

@@ -233,7 +233,7 @@ struct HPMi_interface {
 	void (*event[HPET_MAX]) (void);
 	bool (*addCommand) (char *name, bool (*func)(const int fd, struct map_session_data* sd, const char* command, const char* message,struct AtCommandInfo *info));
 	bool (*addScript) (char *name, char *args, bool (*func)(struct script_state *st), bool isDeprecated);
-	void (*addCPCommand) (char *name, CParseFunc func);
+	void (*addCPCommand) (const char *name, CParseFunc func);
 	/* HPM Custom Data */
 	void (*addToHPData) (enum HPluginDataTypes type, uint32 pluginID, struct hplugin_data_store **storeptr, void *data, uint32 classid, bool autofree);
 	void *(*getFromHPData) (enum HPluginDataTypes type, uint32 pluginID, struct hplugin_data_store *store, uint32 classid);

src/common/atomic.h

@@ -38,6 +38,11 @@
 
 #if _MSC_VER < 1800
 #if !defined(_M_X64)
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 // When compiling for windows 32bit, the 8byte interlocked operations are not provided by Microsoft
 // (because they need at least i586 so its not generic enough.. ... )
 forceinline int64 InterlockedCompareExchange64(volatile int64 *dest, int64 exch, int64 _cmp){
@@ -93,6 +98,10 @@ forceinline volatile int64 InterlockedExchange64(volatile int64 *target, int64 v
 	return old;
 }
 
+#ifdef __cplusplus
+}
+#endif
+
 #else // _M_X64
 #define InterlockedExchange(_Target, _Value) _InterlockedExchange((_Target), (_Value))
 #define InterlockedCompareExchange(_Destination, _ExChange, _Comperand) _InterlockedCompareExchange((_Destination), (_ExChange), (_Comperand))
@@ -110,6 +119,10 @@ forceinline volatile int64 InterlockedExchange64(volatile int64 *target, int64 v
 #error Target platform currently not supported
 #endif
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 static forceinline int64 InterlockedExchangeAdd64(volatile int64 *addend, int64 increment){
 	return __sync_fetch_and_add(addend, increment);
 }//end: InterlockedExchangeAdd64()
@@ -151,6 +164,10 @@ static forceinline int32 InterlockedExchange(volatile int32 *target, int32 val){
 	return __sync_lock_test_and_set(target, val);
 }//end: InterlockedExchange()
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif  // !defined(__MINGW32__) && !defined(MINGW)
 
 #endif //endif compiler decision

src/common/base62.h

@@ -34,10 +34,18 @@ struct base62_interface {
 	bool (*encode_int_padded) (int value, char *buf, int min_len, int buf_len);
 };
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #ifdef HERCULES_CORE
 void base62_defaults(void);
 #endif // HERCULES_CORE
 
 HPShared struct base62_interface *base62;
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // COMMON_BASE62_H

src/common/cbasetypes.h

@@ -282,7 +282,6 @@ typedef uintptr_t uintptr;
 // keyword replacement
 #ifdef _MSC_VER
 // For MSVC (windows)
-#define inline __inline
 #define forceinline __forceinline
 #define ra_align(n) __declspec(align(n))
 #else
@@ -383,6 +382,7 @@ typedef char bool;
 //////////////////////////////////////////////////////////////////////////
 // macro tools
 
+#ifndef __cplusplus
 #ifdef swap // just to be sure
 #undef swap
 #endif
@@ -403,6 +403,7 @@ typedef char bool;
 #ifndef min
 #define min(a,b) (((a) < (b)) ? (a) : (b))
 #endif
+#endif
 
 //////////////////////////////////////////////////////////////////////////
 // should not happen