diff --git a/Src/Containers/FOctree.hpp b/Src/Containers/FOctree.hpp index 922519397b72c23e3880c7064e2e9aeb3fbc0fd3..7ee478a1c09c6ef50950bc2022d4323ca775391b 100644 --- a/Src/Containers/FOctree.hpp +++ b/Src/Containers/FOctree.hpp @@ -738,7 +738,7 @@ public: CellClass* getCell(const MortonIndex inIndex, const int inLevel) const{ SubOctreeTypesConst workingTree; workingTree.tree = this->root; - const MortonIndex treeSubLeafMask = ~(~0x00LL << (3 * workingTree.tree->getSubOctreeHeight() )); + const MortonIndex treeSubLeafMask = ~(~0ULL << (3 * workingTree.tree->getSubOctreeHeight() )); // Find the suboctree a the correct level while(inLevel >= workingTree.tree->getSubOctreeHeight() + workingTree.tree->getSubOctreePosition()) { @@ -750,7 +750,7 @@ public: } // compute correct index in the array - const MortonIndex treeLeafMask = ~(~0x00LL << (3 * (inLevel + 1 - workingTree.tree->getSubOctreePosition()) )); + const MortonIndex treeLeafMask = ~(~0ULL << (3 * (inLevel + 1 - workingTree.tree->getSubOctreePosition()) )); return workingTree.tree->cellsAt(inLevel - workingTree.tree->getSubOctreePosition())[treeLeafMask & inIndex]; } @@ -817,7 +817,7 @@ public: SubOctreeTypesConst workingTree; workingTree.tree = this->root; - const MortonIndex treeMiddleMask = ~(~0x00LL << (3 * workingTree.tree->getSubOctreeHeight() )); + const MortonIndex treeMiddleMask = ~(~0ULL << (3 * workingTree.tree->getSubOctreeHeight() )); // Find the suboctree a the correct level while(inLevel >= workingTree.tree->getSubOctreeHeight() + workingTree.tree->getSubOctreePosition()) { @@ -830,12 +830,12 @@ public: // Be sure there is a parent allocated const int levelInTree = inLevel - workingTree.tree->getSubOctreePosition(); - if( levelInTree && !workingTree.tree->cellsAt(levelInTree - 1)[~(~0x00LL << (3 * levelInTree )) & (inIndex>>3)]){ + if( levelInTree && !workingTree.tree->cellsAt(levelInTree - 1)[~(~0ULL << (3 * levelInTree )) & (inIndex>>3)]){ return nullptr; } // compute correct index in the array and return the @ in array - const MortonIndex treeLeafMask = ~(~0x00LL << (3 * (levelInTree + 1 ) )); + const MortonIndex treeLeafMask = ~(~0ULL << (3 * (levelInTree + 1 ) )); return &workingTree.tree->cellsAt(levelInTree)[treeLeafMask & inIndex]; } @@ -1298,7 +1298,7 @@ public: ContainerClass* getLeafSrc(const MortonIndex inIndex){ SubOctreeTypes workingTree; workingTree.tree = this->root; - const MortonIndex treeSubLeafMask = ~(~0x00LL << (3 * workingTree.tree->getSubOctreeHeight() )); + const MortonIndex treeSubLeafMask = ~(~0ULL << (3 * workingTree.tree->getSubOctreeHeight() )); // Find the suboctree a the correct level while(leafIndex >= workingTree.tree->getSubOctreeHeight() + workingTree.tree->getSubOctreePosition()) { @@ -1310,7 +1310,7 @@ public: } // compute correct index in the array - const MortonIndex treeLeafMask = ~(~0x00LL << (3 * (leafIndex + 1 - workingTree.tree->getSubOctreePosition()) )); + const MortonIndex treeLeafMask = ~(~0ULL << (3 * (leafIndex + 1 - workingTree.tree->getSubOctreePosition()) )); return workingTree.leafTree->getLeafSrc(int(treeLeafMask & inIndex)); } diff --git a/Src/Containers/FSubOctree.hpp b/Src/Containers/FSubOctree.hpp index 67df8f3322366648a8d9d2c66c2171b69fefbf43..7bfc6d0d7b019d891123ad4bb6daea604b087cd9 100644 --- a/Src/Containers/FSubOctree.hpp +++ b/Src/Containers/FSubOctree.hpp @@ -65,7 +65,7 @@ protected: // Remove right useless part - used by child const MortonIndex fullIndex = index >> (3 * (inTreeHeight - (this->subOctreeHeight + this->subOctreePosition) ) ); // Remove left extra data part - used by parent - const MortonIndex treeLeafMask = ~(~0x00LL << (3 * this->subOctreeHeight )); + const MortonIndex treeLeafMask = ~(~0ULL << (3 * this->subOctreeHeight )); return treeLeafMask & fullIndex; }