From abf366213f9f49b3f50503ae2bd15721d8bd4b83 Mon Sep 17 00:00:00 2001
From: Michael Davidsaver <mdavidsaver@gmail.com>
Date: Wed, 11 Mar 2020 16:54:36 -0700
Subject: [PATCH] consistent naming between TypeCode and ArrayType

---
 src/pvxs/sharedArray.h |  8 ++++----
 src/util.cpp           | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/pvxs/sharedArray.h b/src/pvxs/sharedArray.h
index 1b7158e..7e86de8 100644
--- a/src/pvxs/sharedArray.h
+++ b/src/pvxs/sharedArray.h
@@ -32,8 +32,8 @@ enum class ArrayType : uint8_t {
     UInt16= 0x2d,
     UInt32= 0x2e,
     UInt64= 0x2f,
-    Float = 0x4a,
-    Double= 0x4b,
+    Float32=0x4a,
+    Float64=0x4b,
     String= 0x68,
     Value = 0x88, // also used for 0x89 and 0x8a
 };
@@ -56,8 +56,8 @@ CASE(uint8_t,  UInt8);
 CASE(uint16_t, UInt16);
 CASE(uint32_t, UInt32);
 CASE(uint64_t, UInt64);
-CASE(float, Float);
-CASE(double, Double);
+CASE(float, Float32);
+CASE(double, Float64);
 CASE(std::string, String);
 CASE(Value, Value);
 #undef CASE
diff --git a/src/util.cpp b/src/util.cpp
index ed350f6..2162b6b 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -63,8 +63,8 @@ std::ostream& operator<<(std::ostream& strm, ArrayType code)
     CASE(Int16);
     CASE(Int32);
     CASE(Int64);
-    CASE(Float);
-    CASE(Double);
+    CASE(Float32);
+    CASE(Float64);
     CASE(Value);
 #undef CASE
     default:
@@ -87,8 +87,8 @@ std::ostream& operator<<(std::ostream& strm, const shared_array<const void>& arr
     CASE(Int16, int16_t);
     CASE(Int32, int32_t);
     CASE(Int64, int64_t);
-    CASE(Float, float);
-    CASE(Double, double);
+    CASE(Float32, float);
+    CASE(Float64, double);
     CASE(String, std::string);
     CASE(Value, Value);
 #undef CASE
@@ -110,8 +110,8 @@ std::ostream& operator<<(std::ostream& strm, const shared_array<void>& arr)
     CASE(Int16, int16_t);
     CASE(Int32, int32_t);
     CASE(Int64, int64_t);
-    CASE(Float, float);
-    CASE(Double, double);
+    CASE(Float32, float);
+    CASE(Float64, double);
     CASE(String, std::string);
     CASE(Value, Value);
 #undef CASE