From: <bi...@us...> - 2014-09-20 00:06:15
|
Revision: 10469 http://sourceforge.net/p/oorexx/code-0/10469 Author: bigrixx Date: 2014-09-20 00:06:11 +0000 (Sat, 20 Sep 2014) Log Message: ----------- Changes to try to clean up Linux compile errors...this is all I have time for today Modified Paths: -------------- main/trunk/interpreter/classes/ListClass.hpp main/trunk/interpreter/classes/ObjectClass.hpp main/trunk/interpreter/classes/StringClass.hpp main/trunk/interpreter/memory/InternalStack.hpp main/trunk/interpreter/runtime/Numerics.hpp Modified: main/trunk/interpreter/classes/ListClass.hpp =================================================================== --- main/trunk/interpreter/classes/ListClass.hpp 2014-09-19 23:49:31 UTC (rev 10468) +++ main/trunk/interpreter/classes/ListClass.hpp 2014-09-20 00:06:11 UTC (rev 10469) @@ -56,7 +56,7 @@ inline ListClass(RESTORETYPE restoreType) { ; }; ListClass(size_t capacity = DefaultListSize); - ListClass::ListClass(bool fromRexx) { } + ListClass(bool fromRexx) { } virtual void live(size_t); virtual void liveGeneral(MarkReason reason); @@ -132,7 +132,7 @@ protected: // internal support methods - void initialize(size_t capacity = ListClass::DefaultListSize); + void initialize(size_t capacity = DefaultListSize); ListContents::ItemLink validateIndex(RexxObject *index, size_t position); ListContents::ItemLink validateInsertionIndex(RexxObject *index, size_t position); ListContents::ItemLink requiredIndex(RexxObject *index, size_t position); Modified: main/trunk/interpreter/classes/ObjectClass.hpp =================================================================== --- main/trunk/interpreter/classes/ObjectClass.hpp 2014-09-19 23:49:31 UTC (rev 10468) +++ main/trunk/interpreter/classes/ObjectClass.hpp 2014-09-20 00:06:11 UTC (rev 10469) @@ -45,6 +45,7 @@ #define Included_RexxObject #include <new> +#include <string.h> #include "Numerics.hpp" class RexxInternalObject; Modified: main/trunk/interpreter/classes/StringClass.hpp =================================================================== --- main/trunk/interpreter/classes/StringClass.hpp 2014-09-19 23:49:31 UTC (rev 10468) +++ main/trunk/interpreter/classes/StringClass.hpp 2014-09-20 00:06:11 UTC (rev 10469) @@ -48,6 +48,7 @@ #include "StringUtil.hpp" #include "Utilities.hpp" #include "FlagSet.hpp" +#include <string.h> /** * Return type from string isSymbol() method. Modified: main/trunk/interpreter/memory/InternalStack.hpp =================================================================== --- main/trunk/interpreter/memory/InternalStack.hpp 2014-09-19 23:49:31 UTC (rev 10468) +++ main/trunk/interpreter/memory/InternalStack.hpp 2014-09-20 00:06:11 UTC (rev 10469) @@ -49,7 +49,7 @@ { public: void *operator new(size_t size, size_t stackSize); - inline void operator delete(void *, size_t) { ; } + inline void operator delete(void *) { ; } InternalStack() { ; } InternalStack::InternalStack(size_t stackSize); Modified: main/trunk/interpreter/runtime/Numerics.hpp =================================================================== --- main/trunk/interpreter/runtime/Numerics.hpp 2014-09-19 23:49:31 UTC (rev 10468) +++ main/trunk/interpreter/runtime/Numerics.hpp 2014-09-20 00:06:11 UTC (rev 10469) @@ -82,31 +82,31 @@ { public: #ifdef __REXX64__ - static const wholenumber_t Numerics::MAX_WHOLENUMBER = __INT64_C(999999999999999999); - static const wholenumber_t Numerics::MIN_WHOLENUMBER = __INT64_C(-999999999999999999); + static const wholenumber_t MAX_WHOLENUMBER = __INT64_C(999999999999999999); + static const wholenumber_t MIN_WHOLENUMBER = __INT64_C(-999999999999999999); // the digits setting used internally for function/method arguments to allow // for the full range - static const wholenumber_t Numerics::ARGUMENT_DIGITS = ((size_t)18); + static const wholenumber_t ARGUMENT_DIGITS = 18; // this is the digits setting for full size binary settings - static const wholenumber_t Numerics::SIZE_DIGITS = ((size_t)20); + static const wholenumber_t SIZE_DIGITS = 20; #else - static const wholenumber_t Numerics::MAX_WHOLENUMBER = 999999999; - static const wholenumber_t Numerics::MIN_WHOLENUMBER = -999999999; + static const wholenumber_t MAX_WHOLENUMBER = 999999999; + static const wholenumber_t MIN_WHOLENUMBER = -999999999; // the digits setting used internally for function/method arguments to allow // for the full binary value range - static const wholenumber_t Numerics::ARGUMENT_DIGITS = ((size_t)9); + static const wholenumber_t ARGUMENT_DIGITS = 9; // this is the digits setting for full size binary settings - static const wholenumber_t Numerics::SIZE_DIGITS = ((size_t)10); + static const wholenumber_t SIZE_DIGITS = 10; #endif static const wholenumber_t MAX_EXPONENT = 999999999; static const wholenumber_t MIN_EXPONENT = -999999999; - static const wholenumber_t DEFAULT_DIGITS = ((size_t)9); + static const wholenumber_t DEFAULT_DIGITS = 9; // a digits setting for full range integer conversion static const size_t MAX_STRINGSIZE = MAX_WHOLENUMBER; // max numeric digits value for explicit 64-bit conversions - static const wholenumber_t DIGITS64 = ((size_t)20); + static const wholenumber_t DIGITS64 = 20; static const bool FORM_SCIENTIFIC = false; static const bool FORM_ENGINEERING = true; @@ -169,11 +169,11 @@ static RexxString *pointerToString(void *); - static inline bool isValid(wholenumber_t v) { return v <= Numerics::MAX_WHOLENUMBER && v >= Numerics::MIN_WHOLENUMBER; } + static inline bool isValid(wholenumber_t v) { return v <= MAX_WHOLENUMBER && v >= MIN_WHOLENUMBER; } // this has a different name because when compiling for 64-bit, wholenumber_t and int64_t are the same and // the compiler complains. The first is for validating a whole number value, the second is for validating an // explicit 64-bit value. - static inline bool isValid64Bit(int64_t v) { return v <= Numerics::MAX_WHOLENUMBER && v >= Numerics::MIN_WHOLENUMBER; } + static inline bool isValid64Bit(int64_t v) { return v <= MAX_WHOLENUMBER && v >= MIN_WHOLENUMBER; } static inline bool isValid(wholenumber_t v, size_t digits) {return digits >= DEFAULT_DIGITS || abs(v) < validMaxWhole[digits - 1]; } |