fix,solaris: "version" conflicts with math namespace

doublerebel · doublerebel · commit a85a055835c2 · 2016-01-25T23:29:04.000-08:00
lib/Basics/RandomGenerator.cpp: In function 'arangodb::basics::Random::random_e arangodb::basics::Random::selectVersion(arangodb::basics::Random::random_e)':
lib/Basics/RandomGenerator.cpp:544:25: error: reference to 'version' is ambiguous
   random_e oldVersion = version;
                         ^
In file included from ./lib/Basics/Common.h:62:0,
                 from lib/Basics/RandomGenerator.h:27,
                 from lib/Basics/RandomGenerator.cpp:24:
/opt/local/gcc49/lib/gcc/x86_64-sun-solaris2.11/4.9.3/include-fixed/math.h:119:6: note: candidates are: enum version
 enum version {libm_ieee = -1, c_issue_4, ansi_1, strict_ansi};
diff --git a/lib/Basics/RandomGenerator.cpp b/lib/Basics/RandomGenerator.cpp
@@ -45,7 +45,7 @@ namespace {
 /// @brief random version
 ////////////////////////////////////////////////////////////////////////////////
 
-Random::random_e version = Random::RAND_MERSENNE;
+Random::random_e random_version = Random::RAND_MERSENNE;
 
 ////////////////////////////////////////////////////////////////////////////////
 /// @brief random lock
@@ -541,10 +541,10 @@ std::string UniformCharacter::random(size_t length) {
 random_e selectVersion(random_e newVersion) {
   MUTEX_LOCKER(RandomLock);
 
-  random_e oldVersion = version;
-  version = newVersion;
+  random_e oldVersion = random_version;
+  random_version = newVersion;
 
-  switch (version) {
+  switch (random_version) {
     case RAND_MERSENNE: {
       uniformInteger.reset(new UniformIntegerMersenne);
       break;
@@ -605,11 +605,11 @@ random_e selectVersion(random_e newVersion) {
   return oldVersion;
 }
 
-random_e currentVersion() { return version; }
+random_e currentVersion() { return random_version; }
 
 void shutdown() {}
 
-bool isBlocking() { return version == RAND_RANDOM; }
+bool isBlocking() { return random_version == RAND_RANDOM; }
 
 int32_t interval(int32_t left, int32_t right) {
   MUTEX_LOCKER(RandomLock);
