DiscordCoreAPI v2.0.9

RealTimeChris · Dec 3, 2024 · d8881ee · d8881ee
1 parent a6d1022
commit d8881ee
Show file tree

Hide file tree

Showing 20 changed files with 284 additions and 444 deletions.
diff --git a/CMake/BuildFeatureTester.bat b/CMake/BuildFeatureTester.bat
diff --git a/CMake/BuildFeatureTester.sh b/CMake/BuildFeatureTester.sh
diff --git a/CMake/CMakeLists.txt b/CMake/CMakeLists.txt
diff --git a/CMake/DCADetectArchitecture.cmake b/CMake/DCADetectArchitecture.cmake
diff --git a/CMake/main.cpp b/CMake/main.cpp
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -25,12 +25,15 @@ set(Opus_DIR "C:/Vcpkg/installed/x64-windows-static/share/opus") # Set this one
 set(unofficial-sodium_DIR "C:/Vcpkg/installed/x64-windows-static/share/unofficial-sodium") # Set this one to the folder location of the file "unofficial-sodiumConfig.cmake".
 set(Jsonifier_DIR "") # Set this one to the folder location of the file "JsonifierConfig.cmake".
 set(OPENSSL_ROOT_DIR "C:/Vcpkg/installed/x64-windows-static/") # Set this one to the folder location of the include folder and library folders of OpenSSL.
-set(VCPKG_ROOT_DIR "C:/Vcpkg")
 set(CMAKE_BUILD_TYPES "Release;Debug")
 option(BUILD_SHARED_LIBS "Build using shared libraries" ON)
 set(DEV TRUE)
 
-if (EXISTS "${VCPKG_ROOT_DIR}")
+if (EXISTS "${_VCPKG_ROOT_DIR}")
+	set(VCPKG_ROOT_DIR "${_VCPKG_ROOT_DIR}")
+	set(ENV{VCPKG_INSTALLATION_ROOT} "${_VCPKG_ROOT_DIR}")
+else()
+	set(VCPKG_ROOT_DIR "C:/Vcpkg")
 	set(ENV{VCPKG_INSTALLATION_ROOT} "${VCPKG_ROOT_DIR}")
 endif() 
 

diff --git a/Include/discordcoreapi/JsonSpecializations.hpp b/Include/discordcoreapi/JsonSpecializations.hpp
@@ -69,16 +69,17 @@ namespace jsonifier_internal {
 
 	template<jsonifier::serialize_options options, snowflake_t value_type, jsonifier::concepts::buffer_like buffer_type, typename index_type, typename indent_type>
 	struct serialize_impl<options, value_type, buffer_type, index_type, indent_type> {
-		template<typename value_type_new> JSONIFIER_ALWAYS_INLINE static void impl(value_type_new&& value, buffer_type& buffer, index_type&index, indent_type& indent) noexcept {
+		template<typename value_type_new> DCA_ALWAYS_INLINE static void impl(value_type_new&& value, buffer_type& buffer, index_type&index, indent_type& indent) noexcept {
 			jsonifier::string newString{ static_cast<jsonifier::string>(value) };
 			serialize<options>::impl(newString, buffer, index, indent);
 		}
 	};
 
-	template<bool minified, jsonifier::parse_options options, snowflake_t value_type, typename parse_context_type> struct parse_impl<minified, options, value_type, parse_context_type> {
-		JSONIFIER_ALWAYS_INLINE static void impl(value_type& value, parse_context_type& context) noexcept {
+	template<bool minified, jsonifier::parse_options options, snowflake_t value_type, typename buffer_type, typename parse_context_type>
+	struct parse_impl<minified, options, value_type, buffer_type, parse_context_type> {
+		DCA_ALWAYS_INLINE static void impl(value_type& value, parse_context_type& context) noexcept {
 			jsonifier::raw_json_data newString{};
-			parse<minified, options>::impl(newString, context);
+			parse<minified, options>::template impl(newString, context);
 			if (newString.getType() == jsonifier::json_type::String) {
 				value = newString.get<jsonifier::string>();
 			} else {
@@ -92,17 +93,17 @@ namespace jsonifier_internal {
 
 	template<jsonifier::serialize_options options, time_stamp_t value_type, jsonifier::concepts::buffer_like buffer_type, typename index_type, typename indent_type>
 	struct serialize_impl<options, value_type, buffer_type, index_type, indent_type> {
-		template<typename value_type_new> JSONIFIER_ALWAYS_INLINE static void impl(value_type_new&& value, buffer_type& buffer, index_type& index, indent_type& indent) noexcept {
+		template<typename value_type_new> DCA_ALWAYS_INLINE static void impl(value_type_new&& value, buffer_type& buffer, index_type& index, indent_type& indent) noexcept {
 			jsonifier::string newString{ static_cast<jsonifier::string>(value) };
 			serialize<options>::impl(newString, buffer, index, indent);
 		}
 	};
 
-	template<bool minified, jsonifier::parse_options options, time_stamp_t value_type, typename parse_context_type>
-	struct parse_impl<minified, options, value_type, parse_context_type> {
-		JSONIFIER_ALWAYS_INLINE static void impl(value_type& value, parse_context_type& context) noexcept {
+	template<bool minified, jsonifier::parse_options options, time_stamp_t value_type, typename buffer_type, typename parse_context_type>
+	struct parse_impl<minified, options, value_type, buffer_type, parse_context_type> {
+		DCA_ALWAYS_INLINE static void impl(value_type& value, parse_context_type& context) noexcept {
 			jsonifier::raw_json_data newString{};
-			parse<minified, options>::impl(newString, context);
+			parse<minified, options>::template impl(newString, context);
 			if (newString.getType() == jsonifier::json_type::String) {
 				value = newString.get<jsonifier::string>();
 			} else {