marko/semver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean-up code to satisfy GCC's pedantic mode requirements. Add fix for Clang not working with GCC 5 C++ library (https://llvm.org/bugs/show_bug.cgi?id=23529)

Browse Source
This commit is contained in:
Marko Zivanovic
2015-11-25 15:22:13 +01:00
parent d1759caf1c
commit aecbc92030
8 changed files with 33 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/version.h
+3 -3
View File
@@ -136,9 +136,9 @@ namespace version {
/// Copy version data from another Basic_version to this one.
Basic_version& operator=(const Basic_version&);
const int major() const; ///< Get major version.
const int minor() const; ///< Get minor version.
const int patch() const; ///< Get patch version.
int major() const; ///< Get major version.
int minor() const; ///< Get minor version.
int patch() const; ///< Get patch version.
const std::string prerelease() const; ///< Get prerelease version string.
const std::string build() const; ///< Get build version string.
include/version.inl
+7 -6
View File
@@ -24,6 +24,7 @@ SOFTWARE.
#pragma once
#include <sstream>
#include "version.h"
namespace version {
@@ -46,11 +47,11 @@ namespace version {
template<typename Parser, typename Comparator>
Basic_version<Parser, Comparator>::Basic_version(Parser p, Comparator c)
: parser_(p), comparator_(c), ver_(parser_.parse("0.0.0")) {};
: parser_(p), comparator_(c), ver_(parser_.parse("0.0.0")) {}
template<typename Parser, typename Comparator>
Basic_version<Parser, Comparator>::Basic_version(const std::string& v, Parser p, Comparator c)
: parser_(p), comparator_(c), ver_(parser_.parse(v)) {};
: parser_(p), comparator_(c), ver_(parser_.parse(v)) {}
template<typename Parser, typename Comparator>
Basic_version<Parser, Comparator>::Basic_version(const Basic_version<Parser, Comparator>&) = default;
@@ -60,17 +61,17 @@ namespace version {
const Basic_version<Parser, Comparator>&) = default;
template<typename Parser, typename Comparator>
const int Basic_version<Parser, Comparator>::major() const {
int Basic_version<Parser, Comparator>::major() const {
return ver_.major;
}
template<typename Parser, typename Comparator>
const int Basic_version<Parser, Comparator>::minor() const {
int Basic_version<Parser, Comparator>::minor() const {
return ver_.minor;
}
template<typename Parser, typename Comparator>
const int Basic_version<Parser, Comparator>::patch() const {
int Basic_version<Parser, Comparator>::patch() const {
return ver_.patch;
}
@@ -139,4 +140,4 @@ namespace version {
const Basic_version<Parser, Comparator>& r) {
return !(l > r);
}
}
}