[Orxonox-commit 5544] r10207 - code/trunk/src/libraries/tools
bknecht at orxonox.net
bknecht at orxonox.net
Tue Jan 27 23:35:50 CET 2015
Author: bknecht
Date: 2015-01-27 23:35:50 +0100 (Tue, 27 Jan 2015)
New Revision: 10207
Modified:
code/trunk/src/libraries/tools/IcoSphere.cc
Log:
Replacing MSVC code for long integer with cross plattform compatible one
Modified: code/trunk/src/libraries/tools/IcoSphere.cc
===================================================================
--- code/trunk/src/libraries/tools/IcoSphere.cc 2015-01-27 22:23:47 UTC (rev 10206)
+++ code/trunk/src/libraries/tools/IcoSphere.cc 2015-01-27 22:35:50 UTC (rev 10207)
@@ -170,9 +170,9 @@
int IcoSphere::getMiddlePoint(int index0, int index1)
{
bool isFirstSmaller = index0 < index1;
- __int64 smallerIndex = isFirstSmaller ? index0 : index1;
- __int64 largerIndex = isFirstSmaller ? index1 : index0;
- __int64 key = (smallerIndex << 32) | largerIndex;
+ int64_t smallerIndex = isFirstSmaller ? index0 : index1;
+ int64_t largerIndex = isFirstSmaller ? index1 : index0;
+ int64_t key = (smallerIndex << 32) | largerIndex;
if (middlePointIndexCache.find(key) != middlePointIndexCache.end())
return middlePointIndexCache[key];
More information about the Orxonox-commit
mailing list