Address build issues and comments

Author: AndrewNolte

include/rfl/Deprecated.hpp

@@ -41,13 +41,15 @@ struct Deprecated {
 
   Deprecated(const Deprecated& _field) = default;
 
-  template <class U>
+  template <class U, typename std::enable_if<std::is_convertible_v<U, Type>,
+                                             bool>::type = true>
   Deprecated(const Deprecated<_deprecation_message, _description, U>& _field)
       : value_(_field.get()) {}
 
-  template <class U>
+  template <class U, typename std::enable_if<std::is_convertible_v<U, Type>,
+                                             bool>::type = true>
   Deprecated(Deprecated<_deprecation_message, _description, U>&& _field)
-      : value_(_field.get()) {}
+      : value_(std::move(_field.value_)) {}
 
   template <class U, typename std::enable_if<std::is_convertible_v<U, Type>,
                                              bool>::type = true>
@@ -57,11 +59,6 @@ struct Deprecated {
                                              bool>::type = true>
   Deprecated(U&& _value) noexcept : value_(std::forward<U>(_value)) {}
 
-  template <class U, typename std::enable_if<std::is_convertible_v<U, Type>,
-                                             bool>::type = true>
-  Deprecated(const Deprecated<_deprecation_message, _description, U>& _field)
-      : value_(_field.value()) {}
-
   /// Assigns the underlying object to its default value.
   template <class U = Type,
             typename std::enable_if<std::is_default_constructible_v<U>,
@@ -132,7 +129,7 @@ struct Deprecated {
   /// Assigns the underlying object.
   template <class U>
   auto& operator=(Deprecated<_deprecation_message, _description, U>&& _field) {
-    value_ = std::forward<T>(_field.value_);
+    value_ = std::move(_field.value_);
     return *this;
   }
 

src/rfl/avro/to_schema.cpp

@@ -80,6 +80,10 @@ schema::Type type_to_avro_schema_type(
       }
       return schema::Type{.value = any_of};
 
+    } else if constexpr (std::is_same<T, Type::Deprecated>()) {
+      return type_to_avro_schema_type(*_t.type_, _definitions, _already_known,
+                                      _num_unnamed);
+
     } else if constexpr (std::is_same<T, Type::Description>()) {
       // TODO: Return descriptions
       return type_to_avro_schema_type(*_t.type_, _definitions, _already_known,

src/rfl/capnproto/to_schema.cpp

@@ -179,6 +179,10 @@ schema::Type type_to_capnproto_schema_type(
       return any_of_to_capnproto_schema_type(_t, _definitions, _parent,
                                              _cnp_types);
 
+    } else if constexpr (std::is_same<T, Type::Deprecated>()) {
+      return type_to_capnproto_schema_type(*_t.type_, _definitions, _parent,
+                                           _cnp_types);
+
     } else if constexpr (std::is_same<T, Type::Description>()) {
       return type_to_capnproto_schema_type(*_t.type_, _definitions, _parent,
                                            _cnp_types);

tests/json/test_json_schema_deprecation.cpp

@@ -55,9 +55,10 @@ TEST(json, test_deprecated_optional_field) {
 }
 
 TEST(json, test_deprecated_read_write) {
+  const auto expected = R"({"old_name":"legacy","new_name":"current"})";
   const auto obj =
       DeprecatedBasicField{.old_name = "legacy", .new_name = "current"};
-  write_and_read(obj);
+  write_and_read(obj, expected);
 }
 
 }  // namespace test_deprecated_schema