From 5407aaa5150277ee52ec49392be18eb68f2960e5 Mon Sep 17 00:00:00 2001
From: Dirk Zimoch <dirk.zimoch@psi.ch>
Date: Thu, 16 Jul 2026 17:20:58 +0200
Subject: [PATCH 1/2] Suppress MSVC warning C4250

include\pv\pvData.h(539,1): warning C4250: 'epics::pvData::PVString':
inherits 'epics::pvData::PVScalarValue<std::string>::epics::pvData::PVScalarValue<std::string>::deserialize'
via dominance
---
 src/pv/pvData.h | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/pv/pvData.h b/src/pv/pvData.h
index a33fb0eb..1aeb50d1 100644
--- a/src/pv/pvData.h
+++ b/src/pv/pvData.h
@@ -513,6 +513,10 @@ typedef std::tr1::shared_ptr<PVULong> PVULongPtr;
 typedef std::tr1::shared_ptr<PVFloat> PVFloatPtr;
 typedef std::tr1::shared_ptr<PVDouble> PVDoublePtr;
 
+#ifdef _WIN32
+#pragma warning(push)
+#pragma warning(disable:4250)
+#endif
 /**
  * @brief PVString is special case, since it implements SerializableArray
  *
@@ -538,6 +542,9 @@ class epicsShareClass PVString : public PVScalarValue<std::string>, Serializable
     EPICS_NOT_COPYABLE(PVString)
 };
 typedef std::tr1::shared_ptr<PVString> PVStringPtr;
+#ifdef _WIN32
+#pragma warning(pop)
+#endif
 
 
 /**

From 48edbaca77411c3625ceed9907c52d8c75d66a30 Mon Sep 17 00:00:00 2001
From: Dirk Zimoch <dirk.zimoch@psi.ch>
Date: Mon, 20 Jul 2026 19:20:54 +0200
Subject: [PATCH 2/2] Test _MSC_VER instead of _WIN32

---
 src/pv/pvData.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pv/pvData.h b/src/pv/pvData.h
index 1aeb50d1..11bf93fd 100644
--- a/src/pv/pvData.h
+++ b/src/pv/pvData.h
@@ -513,7 +513,7 @@ typedef std::tr1::shared_ptr<PVULong> PVULongPtr;
 typedef std::tr1::shared_ptr<PVFloat> PVFloatPtr;
 typedef std::tr1::shared_ptr<PVDouble> PVDoublePtr;
 
-#ifdef _WIN32
+#ifdef _MSC_VER
 #pragma warning(push)
 #pragma warning(disable:4250)
 #endif
@@ -542,7 +542,7 @@ class epicsShareClass PVString : public PVScalarValue<std::string>, Serializable
     EPICS_NOT_COPYABLE(PVString)
 };
 typedef std::tr1::shared_ptr<PVString> PVStringPtr;
-#ifdef _WIN32
+#ifdef _MSC_VER
 #pragma warning(pop)
 #endif