From 6b0af421dd3c47c04a2dc016b37ef45f51ee6be6 Mon Sep 17 00:00:00 2001 From: Michael Davidsaver Date: Thu, 5 Oct 2017 11:24:23 +0200 Subject: [PATCH] another attempt to appease msvc win64 --- src/pv/pvData.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/pv/pvData.h b/src/pv/pvData.h index b3c496b..27ecb67 100644 --- a/src/pv/pvData.h +++ b/src/pv/pvData.h @@ -399,7 +399,6 @@ struct ScalarStorageOps { ScalarStorageOps(): value(), maxLength(0) {} // initialized in PVString::PVString }; -template<> struct ScalarStorageOps {}; } // namespace detail /** @@ -468,7 +467,7 @@ public: put(castUnsafe(val)); } - FORCE_INLINE void putFrom(const AnyScalar& v) { + inline void putFrom(const AnyScalar& v) { // the template form of putFrom() hides the base class AnyScalar overload PVScalar::putFrom(v); }