misc(coro): deprecate sync methods when DPP_CORO is enabled

brainboxdotcc · Aug 26, 2023 · e0f1bd9 · e0f1bd9
1 parent 957b282
commit e0f1bd9
Show file tree

Hide file tree

Showing 6 changed files with 199 additions and 193 deletions.
diff --git a/buildtools/classes/Generator/SyncGenerator.php b/buildtools/classes/Generator/SyncGenerator.php
@@ -88,7 +88,7 @@ public function checkForChanges(): bool
      */
     public function generateHeaderDef(string $returnType, string $currentFunction, string $parameters, string $noDefaults, string $parameterTypes, string $parameterNames): string
     {
-        return "$returnType {$currentFunction}_sync($parameters);\n\n";
+        return "DPP_DEPRECATED_WITH_CORO $returnType {$currentFunction}_sync($parameters);\n\n";
     }
 
     /**

diff --git a/include/dpp/cluster_sync_calls.h b/include/dpp/cluster_sync_calls.h
diff --git a/include/dpp/coro.h b/include/dpp/coro.h
@@ -19,8 +19,8 @@
  *
  ************************************************************************************/
 
-#ifdef DPP_CORO
 #pragma once
+#ifdef DPP_CORO
 
 #include "coro/async.h"
 #include "coro/coroutine.h"

diff --git a/include/dpp/export.h b/include/dpp/export.h
@@ -63,4 +63,10 @@
 	#define SOCKET int
 #else
 	#include <WinSock2.h>
-#endif
+#endif
+
+#ifdef DPP_CORO
+	#define DPP_DEPRECATED_WITH_CORO [[deprecated("sync methods are deprecated and will be removed in a future version. use coro methods instead")]]
+#else
+	#define DPP_DEPRECATED_WITH_CORO
+#endif
diff --git a/library-vcpkg/CMakeLists.txt b/library-vcpkg/CMakeLists.txt
@@ -25,7 +25,7 @@ target_compile_definitions(
 
 target_compile_options(
 	"${LIB_NAME}" PUBLIC
-	"$<$<PLATFORM_ID:Windows>:/bigobj>"
+	"$<$<PLATFORM_ID:Windows>:/bigobj;/w34996>"
  	"$<$<PLATFORM_ID:Windows>:$<$<CONFIG:Debug>:/sdl;/std:c++17;/Od;/DEBUG;/sdl;/MP;/DFD_SETSIZE=1024;/Zc:preprocessor>>"
 	"$<$<PLATFORM_ID:Windows>:$<$<CONFIG:Release>:/std:c++17;/O2;/Oi;/Oy;/GL;/Gy;/sdl;/MP;/DFD_SETSIZE=1024;/Zc:preprocessor>>"
 	"$<$<PLATFORM_ID:Linux>:$<$<CONFIG:Debug>:-std=c++17;-Wall;-Wempty-body;-Wno-psabi;-Wunknown-pragmas;-Wignored-qualifiers;-Wimplicit-fallthrough;-Wmissing-field-initializers;-Wsign-compare;-Wtype-limits;-Wuninitialized;-Wshift-negative-value;-pthread;-g;-Og;-fPIC>>"

diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
@@ -182,7 +182,7 @@ if(UNIX OR MSYS)
 endif()
 
 if(MSVC)
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /sdl /DFD_SETSIZE=1024")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /sdl /DFD_SETSIZE=1024 /w34996")
 	if(CMAKE_BUILD_TYPE STREQUAL "Debug")
 		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj /Od /DEBUG /Zi")
 	else()