From 00ac5bf64f25ba62a9e68e788c8be4ef9bbc4eec Mon Sep 17 00:00:00 2001
From: Michael Davidsaver <mdavidsaver@bnl.gov>
Date: Tue, 30 Apr 2013 19:10:53 -0400
Subject: [PATCH] PVStructure::getNumberFields != Structure::getNumberFields

Apparently PVStructure::getNumberFields is one indexed???
---
 pvDataApp/factory/Compare.cpp | 6 ++++--
 pvDataApp/factory/printer.cpp | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pvDataApp/factory/Compare.cpp b/pvDataApp/factory/Compare.cpp
index 73f928a..689ac21 100644
--- a/pvDataApp/factory/Compare.cpp
+++ b/pvDataApp/factory/Compare.cpp
@@ -171,13 +171,15 @@ bool compareField(PVScalarArray* left, PVScalarArray* right)
 
 bool compareField(PVStructure* left, PVStructure* right)
 {
-    if(left->getStructure()!=right->getStructure())
+    StructureConstPtr ls = left->getStructure();
+
+    if(*ls!=*right->getStructure())
         return false;
 
     const PVFieldPtrArray& lf = left->getPVFields();
     const PVFieldPtrArray& rf = right->getPVFields();
 
-    for(size_t i=0, nfld=left->getNumberFields(); i<nfld; i++) {
+    for(size_t i=0, nfld=ls->getNumberFields(); i<nfld; i++) {
         if(*lf[i]!=*rf[i])
             return false;
     }
diff --git a/pvDataApp/factory/printer.cpp b/pvDataApp/factory/printer.cpp
index 1b39ecc..648812d 100644
--- a/pvDataApp/factory/printer.cpp
+++ b/pvDataApp/factory/printer.cpp
@@ -59,7 +59,7 @@ void PrinterBase::impl_print(const PVField& pv)
                 const PVFieldPtrArray& vals = fld.getPVFields();
 
                 beginStructure(fld);
-                for(size_t i=0, nfld=fld.getNumberFields(); i<nfld; i++)
+                for(size_t i=0, nfld=fld.getStructure()->getNumberFields(); i<nfld; i++)
                     this->print(*vals[i]);
                 endStructure(fld);
             }