From 8c292eeebc83e3c5fdd392fc0665e2ffb134261b Mon Sep 17 00:00:00 2001
From: dhickin <fdavid.hickin@diamond.ac.uk>
Date: Mon, 11 May 2015 14:02:18 +0100
Subject: [PATCH] Reorder optional fields to consistent order to match new NT
 spec.

---
 src/nt/ntmultiChannel.cpp | 12 ++++++------
 src/nt/ntndarray.cpp      |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/nt/ntmultiChannel.cpp b/src/nt/ntmultiChannel.cpp
index da3e6c5..b48086a 100644
--- a/src/nt/ntmultiChannel.cpp
+++ b/src/nt/ntmultiChannel.cpp
@@ -112,17 +112,17 @@ StructureConstPtr NTMultiChannelBuilder::createStructure()
     fields[ind++] =  fieldCreate->createScalarArray(pvString);
     names[ind] = "isConnected";
     fields[ind++] =  fieldCreate->createScalarArray(pvBoolean);
-    if(timeStamp) {
-        names[ind] = "timeStamp";
-        fields[ind++] = standardField->timeStamp();
+    if(descriptor) {
+        names[ind] = "descriptor";
+        fields[ind++] = fieldCreate->createScalar(pvString);
     }
     if(alarm) {
         names[ind] = "alarm";
         fields[ind++] = standardField->alarm();
     }
-    if(descriptor) {
-        names[ind] = "descriptor";
-        fields[ind++] = fieldCreate->createScalar(pvString);
+    if(timeStamp) {
+        names[ind] = "timeStamp";
+        fields[ind++] = standardField->timeStamp();
     }
     if(severity) {
         names[ind] = "severity";
diff --git a/src/nt/ntndarray.cpp b/src/nt/ntndarray.cpp
index 20214f6..45fdd05 100644
--- a/src/nt/ntndarray.cpp
+++ b/src/nt/ntndarray.cpp
@@ -116,12 +116,12 @@ StructureConstPtr NTNDArrayBuilder::createStructure()
         if (descriptor)
             fb->add("descriptor", pvString);
 
-        if (timeStamp)
-            fb->add("timeStamp", standardField->timeStamp());
-
         if (alarm)
             fb->add("alarm", standardField->alarm());
 
+        if (timeStamp)
+            fb->add("timeStamp", standardField->timeStamp());
+
         if (display)
             fb->add("display", standardField->display());