From d9c3dfcf261ce7698d9ac1ee8cd1dd4272b6c10e Mon Sep 17 00:00:00 2001
From: Dave Hickin <david.hickin@diamond.ac.uk>
Date: Thu, 3 Sep 2015 14:08:56 +0100
Subject: [PATCH] Use NTNDArrayAttribute in constructing NTNDArray

Use NTNDArrayAttribute wrapper to construct NTAttributes in NTNDArray.
Delete unused attribute string.
---
 src/nt/ntndarray.cpp | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/src/nt/ntndarray.cpp b/src/nt/ntndarray.cpp
index c635774..f985ee0 100644
--- a/src/nt/ntndarray.cpp
+++ b/src/nt/ntndarray.cpp
@@ -22,8 +22,6 @@ static NTFieldPtr ntField = NTField::get();
 
 namespace detail {
 
-const std::string ntAttrStr("epics:nt/NTAttribute:1.0");
-
 static FieldCreatePtr fieldCreate = getFieldCreate();
 static PVDataCreatePtr pvDataCreate = getPVDataCreate();
 
@@ -96,13 +94,7 @@ StructureConstPtr NTNDArrayBuilder::createStructure()
 
         if (!attributeStruc)
         {
-            attributeStruc = fb->setId(ntAttrStr)->
-		        add("name", pvString)->
-			    add("value", fieldCreate->createVariantUnion())->
-			    add("descriptor", pvString)->
-                add("sourceType", pvInt)->
-                add("source", pvString)->
-               createStructure();
+            attributeStruc = NTNDArrayAttribute::createBuilder()->createStructure();
         }
 
         fb->setId(NTNDArray::URI)->