From 1cf37a11c592171f2572425eba269ac5e2211bfd Mon Sep 17 00:00:00 2001
From: David Rose <david@ddrose.com>
Date: Thu, 26 Sep 2002 23:04:58 +0000
Subject: [PATCH] tweak parameter names for system collision

---
 panda/src/pstatclient/pStatClientVersion.I | 12 ++++++------
 panda/src/pstatclient/pStatClientVersion.h |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/panda/src/pstatclient/pStatClientVersion.I b/panda/src/pstatclient/pStatClientVersion.I
index b0a9b866a5..5135af0a99 100644
--- a/panda/src/pstatclient/pStatClientVersion.I
+++ b/panda/src/pstatclient/pStatClientVersion.I
@@ -43,9 +43,9 @@ get_minor_version() const {
 //  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE void PStatClientVersion::
-set_version(int major, int minor) {
-  _major_version = major;
-  _minor_version = minor;
+set_version(int major_version, int minor_version) {
+  _major_version = major_version;
+  _minor_version = minor_version;
 }
 
 ////////////////////////////////////////////////////////////////////
@@ -56,7 +56,7 @@ set_version(int major, int minor) {
 //               otherwise.
 ////////////////////////////////////////////////////////////////////
 INLINE bool PStatClientVersion::
-is_at_least(int major, int minor) const {
-  return (_major_version > major ||
-          (_major_version == major && _minor_version >= minor));
+is_at_least(int major_version, int minor_version) const {
+  return (_major_version > major_version ||
+          (_major_version == major_version && _minor_version >= minor_version));
 }
diff --git a/panda/src/pstatclient/pStatClientVersion.h b/panda/src/pstatclient/pStatClientVersion.h
index 65146c6116..b99a0d5dc9 100644
--- a/panda/src/pstatclient/pStatClientVersion.h
+++ b/panda/src/pstatclient/pStatClientVersion.h
@@ -37,9 +37,9 @@ public:
   INLINE int get_major_version() const;
   INLINE int get_minor_version() const;
 
-  INLINE void set_version(int major, int minor);
+  INLINE void set_version(int major_version, int minor_version);
 
-  INLINE bool is_at_least(int major, int minor) const;
+  INLINE bool is_at_least(int major_version, int minor_version) const;
 
 private:
   int _major_version;