From a88d491012adc6b1d3000a85ecdaf0d0f98888c4 Mon Sep 17 00:00:00 2001
From: Michael Davidsaver <mdavidsaver@gmail.com>
Date: Fri, 6 Oct 2017 11:06:23 +0200
Subject: [PATCH] win64 one more time, move explicit instantiations after all
 definitions.

---
 src/factory/PVDataCreateFactory.cpp | 32 ++++++++++++++---------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/factory/PVDataCreateFactory.cpp b/src/factory/PVDataCreateFactory.cpp
index 101919e..bd9acd4 100644
--- a/src/factory/PVDataCreateFactory.cpp
+++ b/src/factory/PVDataCreateFactory.cpp
@@ -64,21 +64,6 @@ template<> const ScalarType PVStringArray::typeCode = pvString;
 template<typename T>
 PVScalarValue<T>::~PVScalarValue() {}
 
-// explicitly instanciate to ensure that windows
-// builds emit exported symbols for inline'd methods
-template class PVScalarValue<boolean>;
-template class PVScalarValue<int8>;
-template class PVScalarValue<uint8>;
-template class PVScalarValue<int16>;
-template class PVScalarValue<uint16>;
-template class PVScalarValue<int32>;
-template class PVScalarValue<uint32>;
-template class PVScalarValue<int64>;
-template class PVScalarValue<uint64>;
-template class PVScalarValue<float>;
-template class PVScalarValue<double>;
-template class PVScalarValue<std::string>;
-
 template<typename T>
 void PVScalarValue<T>::serialize(ByteBuffer *pbuffer,
     SerializableControl *pflusher) const {
@@ -634,7 +619,22 @@ const PVDataCreatePtr& PVDataCreate::getPVDataCreate()
     return pvDataCreate;
 }
 
-}}
+// explicitly instanciate to ensure that windows
+// builds emit exported symbols for inline'd methods
+template class PVScalarValue<boolean>;
+template class PVScalarValue<int8>;
+template class PVScalarValue<uint8>;
+template class PVScalarValue<int16>;
+template class PVScalarValue<uint16>;
+template class PVScalarValue<int32>;
+template class PVScalarValue<uint32>;
+template class PVScalarValue<int64>;
+template class PVScalarValue<uint64>;
+template class PVScalarValue<float>;
+template class PVScalarValue<double>;
+template class PVScalarValue<std::string>;
+
+}} // namespace epics::pvData
 
 namespace std{
     std::ostream& operator<<(std::ostream& o, const epics::pvData::PVField *ptr)