From f0424d682ef24530f901616611fd04f831c8b432 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Wed, 15 Aug 2018 18:25:32 +0200 Subject: Reorder inline function definitions to pacify MinGW GCC (DLL linkage) --- libbutl/semantic-version.ixx | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'libbutl/semantic-version.ixx') diff --git a/libbutl/semantic-version.ixx b/libbutl/semantic-version.ixx index cd88663..c9f6659 100644 --- a/libbutl/semantic-version.ixx +++ b/libbutl/semantic-version.ixx @@ -16,9 +16,11 @@ namespace butl { } + // Note: the order is important to MinGW GCC (DLL linkage). + // inline semantic_version:: - semantic_version (const std::string& s, bool ab) - : semantic_version (s, ab ? "-+" : nullptr) + semantic_version (const std::string& s, std::size_t p, bool ab) + : semantic_version (s, p, ab ? "-+" : nullptr) { } @@ -29,18 +31,9 @@ namespace butl } inline semantic_version:: - semantic_version (const std::string& s, std::size_t p, bool ab) - : semantic_version (s, p, ab ? "-+" : nullptr) - { - } - - inline int semantic_version:: - compare (const semantic_version& v, bool ib) const + semantic_version (const std::string& s, bool ab) + : semantic_version (s, ab ? "-+" : nullptr) { - return (major != v.major ? (major < v.major ? -1 : 1) : - minor != v.minor ? (minor < v.minor ? -1 : 1) : - patch != v.patch ? (patch < v.patch ? -1 : 1) : - ib ? 0 : build.compare (v.build)); } struct semantic_version_result -- cgit v1.1