Bug fix: overflow in compiler automatic static casting

[satune.git] / src / Encoders / elementencoding.h

diff --git a/src/Encoders/elementencoding.h b/src/Encoders/elementencoding.h
index 07404619100d9b0edde04a0c7ceea4d44865f012..3fda7040e42e75364213b08958b4d213e4f4e238 100644 (file)
--- a/src/Encoders/elementencoding.h
+++ b/src/Encoders/elementencoding.h
@@ -17,7 +17,7 @@ public:
        void allocInUseArrayElement(uint size);
        uint numEncodingVars() {return numVars;}
        bool isinUseElement(uint offset) { return (inUseArray[(offset >> 6)] >> (offset & 63)) & 0x1;}
-       void setInUseElement(uint offset) {inUseArray[(offset >> 6)] |= 1 << (offset & 63);}
+       void setInUseElement(uint offset) {inUseArray[(offset >> 6)] |= ((uint64_t)1) << (offset & 63);}
        void encodingArrayInitialization();
        uint getSizeEncodingArray(uint setSize) {
                switch (type) {
@@ -55,7 +55,7 @@ public:
                };
        };
        uint numVars;   /* Number of variables */
-       CMEMALLOC;
+        CMEMALLOC;
 };