try using metaprogramming to get the right type

DarkflameUniverse · Nov 22, 2024 · 226b36d · 226b36d
1 parent b799f89
commit 226b36d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/dCommon/Amf3.h b/dCommon/Amf3.h
@@ -82,8 +82,7 @@ using AMFStringValue = AMFValue<std::string>;
 using AMFDoubleValue = AMFValue<double>;
 
 // Template deduction guide to ensure string literals deduce
-template <size_t N>
-AMFValue(const char (&)[N]) -> AMFValue<std::string>; // AMFStringValue
+AMFValue(const char*) -> AMFValue<std::string>; // AMFStringValue
 
 /**
  * The AMFArrayValue object holds 2 types of lists:
@@ -297,8 +296,10 @@ class AMFArrayValue : public AMFBaseValue {
 	 *
 	 * @return The AMFValue
 	 */
-	template <typename AmfType>
-	[[nodiscard]] AMFValue<AmfType>* Get(const std::string_view key) const {
+	template <typename T>
+	[[nodiscard]] AMFValue<auto>* Get(const std::string_view key) const {
+		using AmfType = std::invoke_result_t<AMFValue(T)>;
+
 		const AMFAssociative::const_iterator it = m_Associative.find(key);
 		return it != m_Associative.cend() ?
 			dynamic_cast<AMFValue<AmfType>*>(it->second.get()) :

diff --git a/tests/dCommonTests/Amf3Tests.cpp b/tests/dCommonTests/Amf3Tests.cpp
@@ -71,7 +71,7 @@ TEST(dCommonTests, AMF3InsertionAssociativeTest) {
 	array.Insert<std::vector<uint32_t>>("Undefined", {});
 	array.Insert("Null", nullptr);
 
-	ASSERT_EQ(array.Get("CString")->GetValueType(), eAmf::String);
+	ASSERT_EQ(array.Get<const char*>("CString")->GetValueType(), eAmf::String);
 	ASSERT_EQ(array.Get<std::string>("String")->GetValueType(), eAmf::String);
 	ASSERT_EQ(array.Get<bool>("False")->GetValueType(), eAmf::False);
 	ASSERT_EQ(array.Get<bool>("True")->GetValueType(), eAmf::True);
@@ -95,7 +95,7 @@ TEST(dCommonTests, AMF3InsertionDenseTest) {
 	array.Push<std::vector<uint32_t>>({});
 
 	ASSERT_EQ(array.Get<std::string>(0)->GetValueType(), eAmf::String);
-	ASSERT_EQ(array.Get(1)->GetValueType(), eAmf::String);
+	ASSERT_EQ(array.Get<const char*>(1)->GetValueType(), eAmf::String);
 	ASSERT_EQ(array.Get<bool>(2)->GetValueType(), eAmf::False);
 	ASSERT_EQ(array.Get<bool>(3)->GetValueType(), eAmf::True);
 	ASSERT_EQ(array.Get<int32_t>(4)->GetValueType(), eAmf::Integer);