From 32d5aed8b0e96645a015f36c0ca65c5755a64466 Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Fri, 20 Mar 2009 06:19:47 +0000 Subject: [PATCH] Ambiguous if/else fixes. --- src/gdd/gdd.cc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/gdd/gdd.cc b/src/gdd/gdd.cc index 40ac5458a..2937b1b52 100644 --- a/src/gdd/gdd.cc +++ b/src/gdd/gdd.cc @@ -973,7 +973,9 @@ gddStatus gdd::convertOffsetsToAddress(void) else if(isScalar()) { if(primitiveType()==aitEnumFixedString) + { if(data.FString) setData(pdd+dp); + } else if(primitiveType()==aitEnumString) { str=(aitString*)dataAddress(); @@ -1051,7 +1053,9 @@ gddStatus gdd::convertAddressToOffsets(void) { // handle the special string scalar cases if(primitiveType()==aitEnumFixedString) + { if(data.FString) setData((gdd*)(dp-pdd)); + } else if(primitiveType()==aitEnumString) { str=(aitString*)dataAddress();