From f6cf87a52d3b78564e03ab552cc7057feb4847a6 Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Wed, 12 Aug 2015 15:06:46 -0500 Subject: [PATCH] Fix build problem on Mac ../../testApp/pv/testPVData.cpp:549:14: error: use of overloaded operator '!=' is ambiguous (with operand types 'PVIntPtr' (aka 'shared_ptr') and 'long') testOk1(a!=NULL); ~^ ~~~~ --- testApp/pv/testPVData.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testApp/pv/testPVData.cpp b/testApp/pv/testPVData.cpp index 2358e57..1c83f88 100644 --- a/testApp/pv/testPVData.cpp +++ b/testApp/pv/testPVData.cpp @@ -538,7 +538,7 @@ static void testFieldAccess() PVStructurePtr fld = pvDataCreate->createPVStructure(tdef); PVIntPtr a = fld->getSubField("test"); - testOk1(a!=NULL); + testOk1(a.get() != NULL); if(a.get()) { PVIntPtr b = fld->getSubFieldT("test"); testOk(b.get()==a.get(), "%p == %p", b.get(), a.get()); @@ -546,7 +546,7 @@ static void testFieldAccess() testSkip(1, "test doesn't exist?"); a = fld->getSubField("hello.world"); - testOk1(a!=NULL); + testOk1(a.get() != NULL); if(a.get()) { PVIntPtr b = fld->getSubFieldT("hello.world"); testOk(b.get()==a.get(), "%p == %p", b.get(), a.get());