From 6b4eb1a1b08d63e9f6524183f06487dfc5370558 Mon Sep 17 00:00:00 2001
From: Marty Kraimer <mrkraimer@comcast.net>
Date: Tue, 28 Aug 2012 13:09:37 -0400
Subject: [PATCH] StandardField: fix enumeratedAlarm ; testConvert fix uint64
 integer constants

---
 pvDataApp/factory/StandardField.cpp | 2 +-
 testApp/pv/testConvert.cpp          | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pvDataApp/factory/StandardField.cpp b/pvDataApp/factory/StandardField.cpp
index 45ccb11..d5e9f5d 100644
--- a/pvDataApp/factory/StandardField.cpp
+++ b/pvDataApp/factory/StandardField.cpp
@@ -393,7 +393,7 @@ static void createEnumeratedAlarm() {
     names[1] = "stateSeverity";
     names[2] = "changeStateSeverity";
     fields[0] = fieldCreate->createScalar(pvBoolean);
-    fields[1] = fieldCreate->createScalar(pvInt);
+    fields[1] = fieldCreate->createScalarArray(pvInt);
     fields[2] = fieldCreate->createScalar(pvInt);
     enumeratedAlarmField = fieldCreate->createStructure("valueAlarm_t",names,fields);
 }
diff --git a/testApp/pv/testConvert.cpp b/testApp/pv/testConvert.cpp
index 4675c96..48763d0 100644
--- a/testApp/pv/testConvert.cpp
+++ b/testApp/pv/testConvert.cpp
@@ -177,7 +177,7 @@ static void testConvertScalar(FILE *fd) {
     fprintf(fd,"fromInt PASSED\n");
 
     if(debug) fprintf(fd,"\nfromLong\n");
-    int64 lval = 0x7fffffffffffffffL;
+    int64 lval = 0x7fffffffffffffffLL;
     for(int i=0; i<3; i++) {
         convert->fromLong(pvBytePtr, lval);
         builder.clear(); pvBytePtr->toString(&builder);
@@ -349,7 +349,7 @@ static void testConvertScalar(FILE *fd) {
     fprintf(fd,"fromUInt PASSED\n");
 
     if(debug) fprintf(fd,"\nfromULong\n");
-    uint64 ulval = 0x7fffffffffffffffL;
+    uint64 ulval = 0x7fffffffffffffffLL;
     for(int i=0; i<3; i++) {
         convert->fromULong(pvBytePtr, ulval);
         builder.clear(); pvBytePtr->toString(&builder);
@@ -537,7 +537,7 @@ static void testConvertScalarArray(FILE *fd) {
 
     if(debug) fprintf(fd,"\nfromLong\n");
     int64 larray[length];
-    int64 lval = 0x7fffffffffffffff;
+    int64 lval = 0x7fffffffffffffffLL;
     larray[0] = lval;
     for(size_t i=1; i<length; i++) larray[i] = larray[i-1] + 1;
     convert->fromLongArray(pvBytePtr,0,length,larray,0);
@@ -709,7 +709,7 @@ static void testConvertScalarArray(FILE *fd) {
 
     if(debug) fprintf(fd,"\nfromULong\n");
     uint64 ularray[length];
-    uint64 ulval = 0x7fffffffffffffff;
+    uint64 ulval = 0x7fffffffffffffffLL;
     ularray[0] = ulval;
     for(size_t i=1; i<length; i++) ularray[i] = ularray[i-1] + 1;
     convert->fromULongArray(pvBytePtr,0,length,ularray,0);