Changeset 610

Timestamp:

08/18/14 10:03:36 (5 years ago)

Author:

jls17

Message:

• moved ARZeroMemory function to Memory.cpp/.h
• added new ARZeroMemory function which has a size parameter to replace ZeroMemory? (which is only available on windows)
• replaced all ZeroMemory? calls with ARZeroMemory
• fixed some gcc compiler warnings
• now ARQualification throws AppException? instead of exception, because in the standard implementation there is no constructor to pass a message to exception class (this MSVC specific)

Location:

branches/work_311

Files:

• ARApi.h (modified) (2 diffs)
• ARInsideLib.vcproj (modified) (1 diff)
• core/ARQualification.cpp (modified) (3 diffs)
• core/ARQualification.h (modified) (1 diff)
• lists/ARFieldList.cpp (modified) (1 diff)
• lists/ARVUIList.cpp (modified) (1 diff)
• project.cmake/files.cmake (modified) (2 diffs)
• util/Memory.cpp (added)
• util/Memory.h (added)

branches/work_311/ARApi.h

@@ -20 +20 @@
 #include <arstruct.h>
 #include <arextern.h>
+#include "util/Memory.h"
 
 // this is just a little workaround for a bug in ar.h version 7.5
@@ -91 +92 @@
 #define AR_XML_VERSION_710 10
 #define AR_XML_VERSION_750 11
-
-// template for clearing memory of AR structs
-template<class T>
-void ARZeroMemory(T* obj) { memset(obj, 0, sizeof(T)); }

branches/work_311/ARInsideLib.vcproj

@@ -2116 +2116 @@
                         <File
                                 RelativePath=".\util\Context.h"
+                                >
+                        </File>
+                        <File
+                                RelativePath=".\util\Memory.cpp"
+                                >
+                        </File>
+                        <File
+                                RelativePath=".\util\Memory.h"
                                 >
                         </File>

branches/work_311/core/ARQualification.cpp

@@ -341 +341 @@
 
                         CDocCurrencyField docCurrency(formId, *operand->u.currencyField);
-                        char *prefix = getFieldPrefix(operand);
+                        const char *prefix = getFieldPrefix(operand);
                         
                         qText << delimiter;
@@ -394 +394 @@
 }
 
-char* CARQualification::getFieldPrefix(ARFieldValueOrArithStruct *operand)
+const char* CARQualification::getFieldPrefix(ARFieldValueOrArithStruct *operand)
 {
         if (operand == NULL) return NULL;
@@ -429 +429 @@
                 return true;
         }
-        throw exception("NotImplementedException");
-}
-
+        throw AppException("NotImplementedException", "ARQual");
+}
+

branches/work_311/core/ARQualification.h

@@ -49 +49 @@
         void CheckOperand(ARFieldValueOrArithStruct *operand, ARFieldValueOrArithStruct *parent, stringstream &qText);
         int FindCurrentEnumFieldId();
-        char* getFieldPrefix(ARFieldValueOrArithStruct *operand);
+        const char* getFieldPrefix(ARFieldValueOrArithStruct *operand);
         bool getFormIdAndDelimiter(ARFieldValueOrArithStruct *operand, int &formId, char &delimiter);
 

branches/work_311/lists/ARFieldList.cpp

@@ -324 +324 @@
 {
         names.nameList = new ARNameType[amount];
-        ZeroMemory(names.nameList, sizeof(ARNameType) * amount);
+        ARZeroMemory(names.nameList, sizeof(ARNameType) * amount);
 
         fieldIds.internalIdList = new ARInternalId[amount];
-        ZeroMemory(fieldIds.internalIdList, sizeof(ARInternalId) * amount);
+        ARZeroMemory(fieldIds.internalIdList, sizeof(ARInternalId) * amount);
 
         fieldMaps.mappingList = new ARFieldMappingStruct[amount];
-        ZeroMemory(fieldMaps.mappingList, sizeof(ARFieldMappingStruct) * amount);
+        ARZeroMemory(fieldMaps.mappingList, sizeof(ARFieldMappingStruct) * amount);
 
         dataTypes.intList = new unsigned int[amount];
-        ZeroMemory(dataTypes.intList, sizeof(unsigned int) * amount);
+        ARZeroMemory(dataTypes.intList, sizeof(unsigned int) * amount);
 
         options.intList = new unsigned int[amount];
-        ZeroMemory(options.intList, sizeof(unsigned int) * amount);
+        ARZeroMemory(options.intList, sizeof(unsigned int) * amount);
 
         createModes.intList = new unsigned int[amount];
-        ZeroMemory(createModes.intList, sizeof(unsigned int) * amount);
+        ARZeroMemory(createModes.intList, sizeof(unsigned int) * amount);
         
         fieldOptions.intList = new unsigned int[amount];
-        ZeroMemory(fieldOptions.intList, sizeof(unsigned int) * amount);
+        ARZeroMemory(fieldOptions.intList, sizeof(unsigned int) * amount);
 
         defaultValues.valueList = new ARValueStruct[amount];
-        ZeroMemory(defaultValues.valueList, sizeof(ARValueStruct) * amount);
+        ARZeroMemory(defaultValues.valueList, sizeof(ARValueStruct) * amount);
 
         permLists.permissionList = new ARPermissionList[amount];
-        ZeroMemory(permLists.permissionList, sizeof(ARPermissionList) * amount);
+        ARZeroMemory(permLists.permissionList, sizeof(ARPermissionList) * amount);
 
         limits.fieldLimitList = new ARFieldLimitStruct[amount];
-        ZeroMemory(limits.fieldLimitList, sizeof(ARFieldLimitStruct) * amount);
+        ARZeroMemory(limits.fieldLimitList, sizeof(ARFieldLimitStruct) * amount);
 
         dInstanceLists.dInstanceList = new ARDisplayInstanceList[amount];
-        ZeroMemory(dInstanceLists.dInstanceList, sizeof(ARDisplayInstanceList) * amount);
+        ARZeroMemory(dInstanceLists.dInstanceList, sizeof(ARDisplayInstanceList) * amount);
 
         helpTexts.stringList = new char*[amount];
-        ZeroMemory(helpTexts.stringList, sizeof(char*) * amount);
+        ARZeroMemory(helpTexts.stringList, sizeof(char*) * amount);
 
         changedTimes.timestampList = new ARTimestamp[amount];
-        ZeroMemory(changedTimes.timestampList, sizeof(ARTimestamp) * amount);
+        ARZeroMemory(changedTimes.timestampList, sizeof(ARTimestamp) * amount);
 
         owners.nameList = new ARAccessNameType[amount];
-        ZeroMemory(owners.nameList, sizeof(ARAccessNameType) * amount);
+        ARZeroMemory(owners.nameList, sizeof(ARAccessNameType) * amount);
 
         changedUsers.nameList = new ARAccessNameType[amount];
-        ZeroMemory(changedUsers.nameList, sizeof(ARAccessNameType) * amount);
+        ARZeroMemory(changedUsers.nameList, sizeof(ARAccessNameType) * amount);
 
         changeDiary.stringList = new char*[amount];
-        ZeroMemory(changeDiary.stringList, sizeof(char*) * amount);
+        ARZeroMemory(changeDiary.stringList, sizeof(char*) * amount);
 
 #if AR_CURRENT_API_VERSION >= AR_API_VERSION_763
         objProps.propsList = new ARPropList[amount];
-        ZeroMemory(objProps.propsList, sizeof(ARPropList) * amount);
+        ARZeroMemory(objProps.propsList, sizeof(ARPropList) * amount);
 #endif
 }

branches/work_311/lists/ARVUIList.cpp

@@ -226 +226 @@
 {
         ids.internalIdList = new ARInternalId[amount];
-        ZeroMemory(ids.internalIdList, sizeof(ARInternalId) * amount);
+        ARZeroMemory(ids.internalIdList, sizeof(ARInternalId) * amount);
 
         names.nameList = new ARNameType[amount];
-        ZeroMemory(names.nameList, sizeof(ARNameType) * amount);
+        ARZeroMemory(names.nameList, sizeof(ARNameType) * amount);
 
         locales.localeList = new ARLocaleType[amount];
-        ZeroMemory(locales.localeList, sizeof(ARLocaleType) * amount);
+        ARZeroMemory(locales.localeList, sizeof(ARLocaleType) * amount);
 
         types.intList = new unsigned int[amount];
-        ZeroMemory(types.intList, sizeof(unsigned int) * amount);
+        ARZeroMemory(types.intList, sizeof(unsigned int) * amount);
 
         dispProps.propsList = new ARPropList[amount];
-        ZeroMemory(dispProps.propsList, sizeof(ARPropList) * amount);
+        ARZeroMemory(dispProps.propsList, sizeof(ARPropList) * amount);
         
         helpTexts.stringList = new char*[amount];
-        ZeroMemory(helpTexts.stringList, sizeof(char*) * amount);
+        ARZeroMemory(helpTexts.stringList, sizeof(char*) * amount);
 
         changedTimes.timestampList = new ARTimestamp[amount];
-        ZeroMemory(changedTimes.timestampList, sizeof(ARTimestamp) * amount);
+        ARZeroMemory(changedTimes.timestampList, sizeof(ARTimestamp) * amount);
         
         owners.nameList = new ARAccessNameType[amount];
-        ZeroMemory(owners.nameList, sizeof(ARAccessNameType) * amount);
+        ARZeroMemory(owners.nameList, sizeof(ARAccessNameType) * amount);
         
         changedUsers.nameList = new ARAccessNameType[amount];
-        ZeroMemory(changedUsers.nameList, sizeof(ARAccessNameType) * amount);
+        ARZeroMemory(changedUsers.nameList, sizeof(ARAccessNameType) * amount);
         
         changeDiary.stringList = new char*[amount];
-        ZeroMemory(changeDiary.stringList, sizeof(char*) * amount);
+        ARZeroMemory(changeDiary.stringList, sizeof(char*) * amount);
 
 #if AR_CURRENT_API_VERSION >= AR_API_VERSION_763
         objProps.propsList = new ARPropList[amount];
-        ZeroMemory(objProps.propsList, sizeof(ARPropList) * amount);
+        ARZeroMemory(objProps.propsList, sizeof(ARPropList) * amount);
 #endif
 }

branches/work_311/project.cmake/files.cmake

@@ -308 +308 @@
  util/CommandLineValidator.cpp
  util/Context.cpp
+ util/Memory.cpp
  util/RefItem.cpp 
  util/ResourceFileLocatorAndExtractor.cpp
@@ -318 +319 @@
  util/CommandLineValidator.h
  util/Context.h
+ util/Memory.h
  util/RefItem.h
  util/ResourceFileLocatorAndExtractor.h