From 1798c4aeca70ac8d0a243684d6a798fbc65735f8 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 20:57:42 +0100 Subject: gentoo resync : 14.07.2018 --- dev-db/gigabase/files/gigabase-3.83-cpp14.patch | 34 ------------------------- 1 file changed, 34 deletions(-) delete mode 100644 dev-db/gigabase/files/gigabase-3.83-cpp14.patch (limited to 'dev-db/gigabase/files/gigabase-3.83-cpp14.patch') diff --git a/dev-db/gigabase/files/gigabase-3.83-cpp14.patch b/dev-db/gigabase/files/gigabase-3.83-cpp14.patch deleted file mode 100644 index 47d2a1a540ff..000000000000 --- a/dev-db/gigabase/files/gigabase-3.83-cpp14.patch +++ /dev/null @@ -1,34 +0,0 @@ -This patch fixes GCC6 (C++14) compilation errors. It replaces two invalid macro -calls with correct code in one place. It also removes redefinitions of fmax and -fmin functions which exist in standard library since C++11. -Gentoo-bug: https://bugs.gentoo.org/show_bug.cgi?id=594550 - ---- a/testddl.cpp -+++ b/testddl.cpp -@@ -102,8 +102,13 @@ - - REGISTER(Record); - -+#if __cplusplus < 201103L - USER_FUNC(sin); - USER_FUNC(cos); -+#else -+static dbUserFunction fsin_descriptor((double (*)(double))&sin, STRLITERAL("sin")); -+static dbUserFunction fcos_descriptor((double (*)(double))&cos, STRLITERAL("cos")); -+#endif - - int __cdecl main() - { ---- a/testtimeseries.cpp -+++ b/testtimeseries.cpp -@@ -47,8 +47,10 @@ - REGISTER(Stock); - - inline int random(unsigned mod) { return rand() % mod; } -+#if __cplusplus < 201103L - inline float fmax(float x, float y) { return x > y ? x : y; } - inline float fmin(float x, float y) { return x < y ? x : y; } -+#endif - - int main(int argc, char* argv[]) - { -- cgit v1.2.3