Lazy-initialize byte order in FloatByteOrder.

Author: emgre

src/ser4cpp/serialization/DoubleFloat.h

@@ -74,7 +74,7 @@ class DoubleFloat : private StaticOnly
 
     static double read(const uint8_t* data)
     {
-        if (FloatByteOrder::get_byte_order() == FloatByteOrder::Value::normal)
+        if (FloatByteOrder::order() == FloatByteOrder::Value::normal)
         {
             DoubleFloatUnion x = {{ data[0], data[1], data[2], data[3], data[4], data[5], data[6], data[7] }};
             return x.value;
@@ -88,7 +88,7 @@ class DoubleFloat : private StaticOnly
 
     static void write(uint8_t* dest, double value)
     {
-        if (FloatByteOrder::get_byte_order() == FloatByteOrder::Value::normal)
+        if (FloatByteOrder::order() == FloatByteOrder::Value::normal)
         {
             memcpy(dest, &value, size);
         }

src/ser4cpp/serialization/FloatByteOrder.h

@@ -41,7 +41,20 @@ struct FloatByteOrder : private StaticOnly
         reverse,
         unsupported
     };
-    
+
+    static Value order()
+    {
+        static Value order = get_byte_order();
+        return order;
+    }
+
+private:
+    union FloatUnion
+    {
+        uint8_t bytes[4];
+        float f;
+    };
+
     static Value get_byte_order()
     {
         if (is_normal_byte_order())
@@ -58,13 +71,6 @@ struct FloatByteOrder : private StaticOnly
         }
     }
 
-private:
-    union FloatUnion
-    {
-        uint8_t bytes[4];
-        float f;
-    };
-
     static bool is_normal_byte_order()
     {
         FloatUnion value = {{ 0x00, 0x00, 0xA0, 0xC1 }};

src/ser4cpp/serialization/SingleFloat.h

@@ -70,7 +70,7 @@ class SingleFloat : private StaticOnly
 
     static float read(const uint8_t* data)
     {
-        if (FloatByteOrder::get_byte_order() == FloatByteOrder::Value::normal)
+        if (FloatByteOrder::order() == FloatByteOrder::Value::normal)
         {
             SingleFloatUnion x = {{ data[0], data[1], data[2], data[3] }};
             return x.value;
@@ -84,7 +84,7 @@ class SingleFloat : private StaticOnly
 
     static void write(uint8_t* dest, float value)
     {
-        if (FloatByteOrder::get_byte_order() == FloatByteOrder::Value::normal)
+        if (FloatByteOrder::order() == FloatByteOrder::Value::normal)
         {
             memcpy(dest, &value, size);
         }

test/TestFloatSerialization.cpp

@@ -58,7 +58,7 @@ bool TestFloatParsing(std::string expected_hex, typename T::type_t value)
 
 TEST_CASE(SUITE("Float memory byte order is IEEE 754"))
 {
-    REQUIRE(ser4cpp::FloatByteOrder::get_byte_order() != FloatByteOrder::Value::unsupported);
+    REQUIRE(ser4cpp::FloatByteOrder::order() != FloatByteOrder::Value::unsupported);
 }
 
 TEST_CASE(SUITE("DoubleFloatSerialization"))