Move type GetterFunction into struct ReadableProperty.

cpp/subprojects/common/include/mlrl/common/util/properties.hpp

@@ -7,14 +7,6 @@
 #include <memory>
 #include <utility>
 
-/**
- * A getter function.
- *
- * @tparam T The return type of the getter function
- */
-template<typename T>
-using GetterFunction = std::function<T&()>;
-
 /**
  * Provides access to a property via a getter function.
  *
@@ -24,15 +16,20 @@ template<typename T>
 struct ReadableProperty {
  public:
 
+ /**
+ * A getter function.
+ */
+ typedef std::function<T&()> GetterFunction;
+
  /**
  * The getter function.
  */
- const GetterFunction<T> get;
+ const GetterFunction get;
 
  /**
  * @param getterFunction The getter function
  */
- ReadableProperty(GetterFunction<T> getterFunction) : get(getterFunction) {}
+ ReadableProperty(GetterFunction getterFunction) : get(getterFunction) {}
 };
 
 /**
@@ -74,7 +71,8 @@ struct Property : public ReadableProperty<T>,
  * @param getterFunction The getter function
  * @param setterFunction The setter function
  */
- Property(GetterFunction<T> getterFunction, typename WritableProperty<T>::SetterFunction setterFunction)
+ Property(typename ReadableProperty<T>::GetterFunction getterFunction,
+ typename WritableProperty<T>::SetterFunction setterFunction)
  : ReadableProperty<T>(getterFunction), WritableProperty<T>(setterFunction) {}
 };
 
@@ -86,7 +84,7 @@ struct Property : public ReadableProperty<T>,
  * @return The `GetterFunction` that has been created
  */
 template<typename T>
-static inline GetterFunction<T> getterFunction(const std::unique_ptr<T>& uniquePtr) {
+static inline typename ReadableProperty<T>::GetterFunction getterFunction(const std::unique_ptr<T>& uniquePtr) {
  return [&uniquePtr]() -> T& {
  return *uniquePtr;
  };