From a4f35714a0865ec93e16e8238d56f7e456cf7ddc Mon Sep 17 00:00:00 2001
From: Michael Davidsaver <mdavidsaver@gmail.com>
Date: Wed, 27 Jun 2018 15:46:10 -0700
Subject: [PATCH] placate MSVC, take 2

---
 testApp/testdbf_copy.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/testApp/testdbf_copy.cpp b/testApp/testdbf_copy.cpp
index 599e63b..321e20b 100644
--- a/testApp/testdbf_copy.cpp
+++ b/testApp/testdbf_copy.cpp
@@ -123,12 +123,12 @@ template<typename input_t, typename output_t>
 void testDBR2PVD_scalar(const input_t& input,
                         const output_t& expect)
 {
-    pvd::ScalarType IN = (pvd::ScalarType)pvd::ScalarTypeID<input_t>::value,
-                   OUT = (pvd::ScalarType)pvd::ScalarTypeID<output_t>::value;
-    testDiag("testDBR2PVD_scalar(%s, %s)", pvd::ScalarTypeFunc::name(IN), pvd::ScalarTypeFunc::name(OUT));
+    pvd::ScalarType  in = (pvd::ScalarType)pvd::ScalarTypeID<input_t>::value;
+    pvd::ScalarType out = (pvd::ScalarType)pvd::ScalarTypeID<output_t>::value;
+    testDiag("testDBR2PVD_scalar(%s, %s)", pvd::ScalarTypeFunc::name(in), pvd::ScalarTypeFunc::name(out));
 
     pvd::PVStructure::shared_pointer top(pvd::getPVDataCreate()->createPVStructure(pvd::getFieldCreate()->createFieldBuilder()
-                                                                                   ->add("value", OUT) // initially zero or ""
+                                                                                   ->add("value", out) // initially zero or ""
                                                                                    ->createStructure()));
     pvd::PVStringArray::const_svector choices;
     pvd::BitSet changed;