[Lldb-commits] [lldb] r344250 - [lldb] rename MinOS::minor to MinOS::minor_version etc. NFC

[Eric Liu via lldb-commits]

Author: ioeric
Date: Thu Oct 11 07:44:12 2018
New Revision: 344250

URL: http://llvm.org/viewvc/llvm-project?rev=344250&view=rev
Log:
[lldb] rename MinOS::minor to MinOS::minor_version etc. NFC

The constructor initializer minor(...)/major(...) can be confused with system
macros `#define minor(...)` on some platforms.

Modified:
    lldb/trunk/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp

Modified: lldb/trunk/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp?rev=344250&r1=344249&r2=344250&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp (original)
+++ lldb/trunk/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp Thu Oct 11 07:44:12 2018
@@ -4944,11 +4944,11 @@ namespace {
   };
 
   struct MinOS {
-    uint32_t major, minor, patch;
+    uint32_t major_version, minor_version, patch_version;
     MinOS(uint32_t version)
-        : major(version >> 16),
-          minor((version >> 8) & 0xffu),
-          patch(version & 0xffu) {}
+        : major_version(version >> 16),
+          minor_version((version >> 8) & 0xffu),
+          patch_version(version & 0xffu) {}
   };
 } // namespace
 
@@ -5006,8 +5006,8 @@ bool ObjectFileMachO::GetArchitecture(co
                                 data.GetByteOrder(), &version_min) == 0)
             break;
           MinOS min_os(version_min.version);
-          os << GetOSName(load_cmd.cmd) << min_os.major << '.' << min_os.minor
-             << '.' << min_os.patch;
+          os << GetOSName(load_cmd.cmd) << min_os.major_version << '.'
+             << min_os.minor_version << '.' << min_os.patch_version;
           triple.setOSName(os.str());
           return true;
         }
@@ -5037,8 +5037,8 @@ bool ObjectFileMachO::GetArchitecture(co
           OSEnv os_env(build_version.platform);
           if (os_env.os_type.empty())
             continue;
-          os << os_env.os_type << min_os.major << '.' << min_os.minor << '.'
-             << min_os.patch;
+          os << os_env.os_type << min_os.major_version << '.'
+             << min_os.minor_version << '.' << min_os.patch_version;
           triple.setOSName(os.str());
           if (!os_env.environment.empty())
             triple.setEnvironmentName(os_env.environment);