From ddab44823fbc24ecbbcd70b4c488bf97d5496e9e Mon Sep 17 00:00:00 2001
From: Dave Hickin <david.hickin@diamond.ac.uk>
Date: Sat, 29 Aug 2015 11:09:32 +0100
Subject: [PATCH] Use NTAttribute wrapper in NTNDArray

Use the wrapper NTAttribute wrapper NTNDArrayAttribute to test the
attribute field in implementation of NTNDArray::isCompatible(Structure).
---
 src/nt/ntndarray.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/nt/ntndarray.cpp b/src/nt/ntndarray.cpp
index f00be5c..7239688 100644
--- a/src/nt/ntndarray.cpp
+++ b/src/nt/ntndarray.cpp
@@ -9,6 +9,7 @@
 
 #define epicsExportSharedSymbols
 #include <pv/ntndarray.h>
+#include <pv/ntndarrayAttribute.h>
 #include <pv/ntutils.h>
 
 using namespace std;
@@ -247,7 +248,7 @@ bool NTNDArray::isCompatible(PVStructurePtr const & pvStructure)
     pvField = pvStructure->getSubField("dataTimeStamp");
     if(pvField && !ntField->isTimeStamp(pvField->getField())) return false;
     PVStructureArrayPtr pvAttribute = pvStructure->getSubField<PVStructureArray>("attribute");
-    if(pvAttribute->getStructureArray()->getStructure()->getID().compare(ntAttrStr)!=0) return false;
+    if(!NTNDArrayAttribute::isCompatible(pvAttribute->getStructureArray()->getStructure())) return false;
     return true;
 }