Fix another case of clashing MakeUnique name coming from user code.

mikke89 · Feb 27, 2023 · 0bc53e0 · 0bc53e0
1 parent 032499f
commit 0bc53e0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/Include/RmlUi/Core/DataModelHandle.h b/Include/RmlUi/Core/DataModelHandle.h
@@ -145,7 +145,7 @@ inline bool DataModelConstructor::RegisterScalar(DataTypeGetFunc<T> get_func, Da
  static_assert(!is_builtin_data_scalar<T>::value, "Cannot register scalar data type function. Arithmetic types and String are handled internally and does not need to be registered.");
  const FamilyId id = Family<T>::Id();
 
- auto scalar_func_definition = MakeUnique<ScalarFuncDefinition<T>>(get_func, set_func);
+ auto scalar_func_definition = Rml::MakeUnique<ScalarFuncDefinition<T>>(get_func, set_func);
 
  const bool inserted = type_register->RegisterDefinition(id, std::move(scalar_func_definition));
  if (!inserted)
@@ -178,7 +178,7 @@ inline StructHandle<T> DataModelConstructor::RegisterStruct()
  static_assert(std::is_class<T>::value, "Type must be a struct or class type.");
  const FamilyId id = Family<T>::Id();
 
- auto struct_definition = MakeUnique<StructDefinition>();
+ auto struct_definition = Rml::MakeUnique<StructDefinition>();
  StructDefinition* struct_variable_raw = struct_definition.get();
 
  const bool inserted = type_register->RegisterDefinition(id, std::move(struct_definition));
@@ -201,7 +201,7 @@ inline bool DataModelConstructor::RegisterArray()
  return false;
 
  const FamilyId container_id = Family<Container>::Id();
- auto array_definition = MakeUnique<ArrayDefinition<Container>>(value_variable);
+ auto array_definition = Rml::MakeUnique<ArrayDefinition<Container>>(value_variable);
 
  const bool inserted = type_register->RegisterDefinition(container_id, std::move(array_definition));
  if (!inserted)

diff --git a/Include/RmlUi/Core/DataTypeRegister.h b/Include/RmlUi/Core/DataTypeRegister.h
@@ -90,7 +90,7 @@ class RMLUICORE_API DataTypeRegister final : NonCopyMoveable {
  UniquePtr<VariableDefinition>& definition = result.first->second;
 
  if (inserted)
- definition = MakeUnique<ScalarDefinition<T>>();
+ definition = Rml::MakeUnique<ScalarDefinition<T>>();
 
  return definition.get();
  }
@@ -138,7 +138,7 @@ class RMLUICORE_API DataTypeRegister final : NonCopyMoveable {
  UniquePtr<VariableDefinition>& definition = result.first->second;
 
  if (inserted)
- definition = MakeUnique<PointerDefinition<T>>(underlying_definition);
+ definition = Rml::MakeUnique<PointerDefinition<T>>(underlying_definition);
 
  return definition.get();
  }