This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

Sysstat lib: version number functions renamed to avoid conflicts

  • Loading branch information...
1 parent c207244 commit 0e9f070cad9c990b496f2b19ab2c25970fc413a3 @kuzmas kuzmas committed Jan 19, 2013
Showing with 6 additions and 6 deletions.
  1. +3 −3 libraries/sysstat/version.cpp
  2. +3 −3 libraries/sysstat/version.hpp
@@ -37,17 +37,17 @@ QString verbose(void)
return QString("%1.%2.%3").arg(MAJOR_VERSION_STR).arg(MINOR_VERSION_STR).arg(PATCH_VERSION_STR);
}
-int major(void)
+int major_number(void)
{
return MAJOR_VERSION;
}
-int minor(void)
+int minor_number(void)
{
return MINOR_VERSION;
}
-int patch(void)
+int patch_number(void)
{
return PATCH_VERSION;
}
@@ -32,9 +32,9 @@ namespace SysStat {
namespace version {
QString verbose(void);
- int major(void);
- int minor(void);
- int patch(void);
+ int major_number(void);
+ int minor_number(void);
+ int patch_number(void);
}
}

0 comments on commit 0e9f070

Please sign in to comment.