Changeset 59:03ab00493dfc in rrlib_si_units

Timestamp:

02.06.2017 23:25:49 (2 years ago)

Author:

Max Reichardt <mreichardt@…>

Branch:

17.03

Phase:

public

Message:

Adapts to changes in rrlib_rtti

Files:

• rtti.cpp (modified) (1 diff)
• rtti.h (modified) (2 diffs)
• tests/test.cpp (modified) (2 diffs)

rtti.cpp

@@ -67 +67 @@
 //----------------------------------------------------------------------
 
-static rtti::tType init_types[] =
+rtti::tType init_types[] =
 {
   rtti::tDataType<tLength<double>>(),

rtti.h

@@ -71 +71 @@
    * \return Type name to use in rrlib_rtti for type T
    */
-  static std::string Get()
+  static util::tManagedConstCharPointer Get(const rrlib::rtti::tType& type)
   {
     std::stringstream str;
-    str << "Quantity<" << TUnit() << ", " << TypeName<TValue>::Get() << ">";
-    return str.str();
+    str << "Quantity<" << TUnit() << ", " << rtti::tDataType<TValue>().GetName() << ">";
+    return util::tManagedConstCharPointer(str.str().c_str(), true);
   }
+
+  static constexpr tGetTypenameFunction value = &Get;
 };
 
@@ -86 +88 @@
    * \return Type name to use in rrlib_rtti for type T
    */
-  static std::string Get()
+  static util::tManagedConstCharPointer Get(const rrlib::rtti::tType& type)
   {
     std::stringstream str;
     str << "Quantity<" << TUnit() << ", Angle>";
-    return str.str();
+    return util::tManagedConstCharPointer(str.str().c_str(), true);
   }
+
+  static constexpr tGetTypenameFunction value = &Get;
+};
+
+template <typename TUnit, typename TValue>
+struct UnderlyingType<si_units::tQuantity<TUnit, TValue>>
+{
+  typedef TValue type;
+  enum { cREVERSE_CAST_VALID = true };
+  enum { cBINARY_SERIALIZATION_DIFFERS = false };
+  enum { cOTHER_SERIALIZATION_DIFFERS = true };
 };
 

tests/test.cpp

@@ -160 +160 @@
     serialization::tMemoryBuffer memory_buffer;
     serialization::tOutputStream output_stream(memory_buffer);
-    serialization::tInputStream input_stream(memory_buffer);
 
     output_stream << tLength<double>(10);
@@ -166 +165 @@
     output_stream.Flush();
 
+    serialization::tInputStream input_stream(memory_buffer);
     input_stream >> length;
     RRLIB_UNIT_TESTS_EQUALITY(tLength<double>(10), length);