From 1655dc988c5c0650e5d031bbe58394b15cd6fdc1 Mon Sep 17 00:00:00 2001
From: Philip Withnall <pwithnall@endlessos.org>
Date: Wed, 21 Oct 2020 10:51:14 +0100
Subject: [PATCH] Revert "Use C++11 decltype where possible"

This reverts commit 0d81443ec025b832d3f072a25bdc8e74c13a3919.

It breaks WebKit and GJS, so should be reverted for now. These changes
may be reintroduced if a solution can be found for the breakage.

See https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1575#note_940048
---
 glib/gmacros.h         |  4 ---
 glib/tests/cxx.cpp     | 64 ------------------------------------------
 glib/tests/meson.build |  3 --
 3 files changed, 71 deletions(-)
 delete mode 100644 glib/tests/cxx.cpp

diff --git a/glib/gmacros.h b/glib/gmacros.h
index 0dd9a41c2..01139b271 100644
--- a/glib/gmacros.h
+++ b/glib/gmacros.h
@@ -234,10 +234,6 @@
 #undef glib_typeof
 #if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8)) && !defined(__cplusplus)
 #define glib_typeof(t) __typeof__ (t)
-#elif defined(__cplusplus) && __cplusplus >= 201103L
-/* C++11 decltype() is close enough for our usage */
-#include <type_traits>
-#define glib_typeof(t) std::remove_reference<decltype (t)>::type
 #endif
 
 /*
diff --git a/glib/tests/cxx.cpp b/glib/tests/cxx.cpp
deleted file mode 100644
index c423b2fbc..000000000
--- a/glib/tests/cxx.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright 2020 Xavier Claessens
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <glib.h>
-
-typedef struct
-{
-  int dummy;
-} MyObject;
-
-static void
-test_typeof (void)
-{
-#if __cplusplus >= 201103L
-  // Test that with C++11 we don't get those kind of errors:
-  // error: invalid conversion from ‘gpointer’ {aka ‘void*’} to ‘MyObject*’ [-fpermissive]
-  MyObject *obj = g_rc_box_new0 (MyObject);
-  MyObject *obj2 = g_rc_box_acquire (obj);
-  g_assert_true (obj2 == obj);
-
-  MyObject *obj3 = g_atomic_pointer_get (&obj2);
-  g_assert_true (obj3 == obj);
-
-  MyObject *obj4 = nullptr;
-  g_atomic_pointer_set (&obj4, obj3);
-  g_assert_true (obj4 == obj);
-
-  MyObject *obj5 = nullptr;
-  g_atomic_pointer_compare_and_exchange (&obj5, nullptr, obj4);
-  g_assert_true (obj5 == obj);
-
-  MyObject *obj6 = g_steal_pointer (&obj5);
-  g_assert_true (obj6 == obj);
-
-  g_clear_pointer (&obj6, g_rc_box_release);
-  g_rc_box_release (obj);
-#else
-  g_test_skip ("This test requires C++11 compiler");
-#endif
-}
-
-int
-main (int argc, char *argv[])
-{
-  g_test_init (&argc, &argv, NULL);
-
-  g_test_add_func ("/C++/typeof", test_typeof);
-
-  return g_test_run ();
-}
diff --git a/glib/tests/meson.build b/glib/tests/meson.build
index 1c78dbf08..567f5eda4 100644
--- a/glib/tests/meson.build
+++ b/glib/tests/meson.build
@@ -14,9 +14,6 @@ glib_tests = {
   'collate' : {},
   'cond' : {},
   'convert' : {},
-  'cxx' : {
-    'source' : ['cxx.cpp'],
-  },
   'dataset' : {},
   'date' : {},
   'dir' : {},