From b74a6a78bf9f5fd74da13201460562d6b1ea8733 Mon Sep 17 00:00:00 2001
From: Michael Penick <michael.penick@datastax.com>
Date: Fri, 26 Feb 2016 14:16:28 -0700
Subject: [PATCH] Changed major/minor to major_version/minor_version to avoid
 naming conflicts on some platforms

---
 src/host.cpp     |  2 +-
 src/host.hpp     | 38 +++++++++++++++++++-------------------
 src/metadata.cpp |  2 +-
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/host.cpp b/src/host.cpp
index 69d3f5293..3250bf5a4 100644
--- a/src/host.cpp
+++ b/src/host.cpp
@@ -76,7 +76,7 @@ void Host::LatencyTracker::update(uint64_t latency_ns) {
 }
 
 bool VersionNumber::parse(const std::string& version) {
-  return sscanf(version.c_str(), "%d.%d.%d", &major_, &minor_, &patch_) >= 2;
+  return sscanf(version.c_str(), "%d.%d.%d", &major_version_, &minor_version_, &patch_version_) >= 2;
 }
 
 } // namespace cass
diff --git a/src/host.hpp b/src/host.hpp
index 9f3c4a716..3d1187e6a 100644
--- a/src/host.hpp
+++ b/src/host.hpp
@@ -49,42 +49,42 @@ struct TimestampedAverage {
 class VersionNumber {
 public:
   VersionNumber()
-    : major_(0)
-    , minor_(0)
-    , patch_(0) { }
+    : major_version_(0)
+    , minor_version_(0)
+    , patch_version_(0) { }
 
-  VersionNumber(int major, int minor, int patch)
-    : major_(major)
-    , minor_(minor)
-    , patch_(patch) { }
+  VersionNumber(int major_version, int minor_version, int patch_version)
+    : major_version_(major_version)
+    , minor_version_(minor_version)
+    , patch_version_(patch_version) { }
 
   bool operator >=(const VersionNumber& other) const {
     return compare(other) >= 0;
   }
 
   int compare(const VersionNumber& other) const {
-    if (major_ < other.major_) return -1;
-    if (major_ > other.major_) return  1;
+    if (major_version_ < other.major_version_) return -1;
+    if (major_version_ > other.major_version_) return  1;
 
-    if (minor_ < other.minor_) return -1;
-    if (minor_ > other.minor_) return  1;
+    if (minor_version_ < other.minor_version_) return -1;
+    if (minor_version_ > other.minor_version_) return  1;
 
-    if (patch_ < other.patch_) return -1;
-    if (patch_ > other.patch_) return  1;
+    if (patch_version_ < other.patch_version_) return -1;
+    if (patch_version_ > other.patch_version_) return  1;
 
     return 0;
   }
 
   bool parse(const std::string& version);
 
-  int major() const { return major_; }
-  int minor() const { return minor_; }
-  int patch() const { return patch_; }
+  int major_version() const { return major_version_; }
+  int minor_version() const { return minor_version_; }
+  int patch_version() const { return patch_version_; }
 
 private:
-  int major_;
-  int minor_;
-  int patch_;
+  int major_version_;
+  int minor_version_;
+  int patch_version_;
 };
 
 class Host : public RefCounted<Host> {
diff --git a/src/metadata.cpp b/src/metadata.cpp
index 9af2bb829..c83f8ad0a 100644
--- a/src/metadata.cpp
+++ b/src/metadata.cpp
@@ -1045,7 +1045,7 @@ void TableMetadata::build_keys_and_sort(const MetadataConfig& config) {
   // 2) Clustering keys
   // 3) Other columns
 
-  if (config.cassandra_version.major() >= 2) {
+  if (config.cassandra_version.major_version() >= 2) {
     partition_key_.resize(get_column_count(columns_, CASS_COLUMN_TYPE_PARTITION_KEY));
     clustering_key_.resize(get_column_count(columns_, CASS_COLUMN_TYPE_CLUSTERING_KEY));
     for (ColumnMetadata::Vec::const_iterator i = columns_.begin(),