mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-10-07 00:31:11 +00:00
fb7b08388e
The previous implementaiton of the compatibility wrapper failed with clang when used inside a macro. This seems like a compiler error not to ignore the deprecation. Workaround by refactoring the g_type_ensure() wrapper. Signed-off-by: Thomas Haller <thaller@redhat.com>
154 lines
4.4 KiB
C
154 lines
4.4 KiB
C
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
|
|
/*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program 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 General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License along
|
|
* with this program; if not, write to the Free Software Foundation, Inc.,
|
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
*
|
|
* Copyright 2008 - 2011 Red Hat, Inc.
|
|
*/
|
|
|
|
#ifndef __NM_GLIB_COMPAT_H__
|
|
#define __NM_GLIB_COMPAT_H__
|
|
|
|
|
|
#include <glib.h>
|
|
#include <glib-object.h>
|
|
|
|
|
|
#ifdef __clang__
|
|
|
|
#undef G_GNUC_BEGIN_IGNORE_DEPRECATIONS
|
|
#undef G_GNUC_END_IGNORE_DEPRECATIONS
|
|
|
|
#define G_GNUC_BEGIN_IGNORE_DEPRECATIONS \
|
|
_Pragma("clang diagnostic push") \
|
|
_Pragma("clang diagnostic ignored \"-Wdeprecated-declarations\"")
|
|
|
|
#define G_GNUC_END_IGNORE_DEPRECATIONS \
|
|
_Pragma("clang diagnostic pop")
|
|
|
|
#endif
|
|
|
|
|
|
#include "nm-gvaluearray-compat.h"
|
|
|
|
|
|
static inline void
|
|
__g_type_ensure (GType type)
|
|
{
|
|
#if !GLIB_CHECK_VERSION(2,34,0)
|
|
if (G_UNLIKELY (type == (GType)-1))
|
|
g_error ("can't happen");
|
|
#else
|
|
G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
|
|
g_type_ensure (type);
|
|
G_GNUC_END_IGNORE_DEPRECATIONS;
|
|
#endif
|
|
}
|
|
#define g_type_ensure __g_type_ensure
|
|
|
|
#if !GLIB_CHECK_VERSION(2,34,0)
|
|
|
|
#define g_clear_pointer(pp, destroy) \
|
|
G_STMT_START { \
|
|
G_STATIC_ASSERT (sizeof *(pp) == sizeof (gpointer)); \
|
|
/* Only one access, please */ \
|
|
gpointer *_pp = (gpointer *) (pp); \
|
|
gpointer _p; \
|
|
/* This assignment is needed to avoid a gcc warning */ \
|
|
GDestroyNotify _destroy = (GDestroyNotify) (destroy); \
|
|
\
|
|
(void) (0 ? (gpointer) *(pp) : 0); \
|
|
do \
|
|
_p = g_atomic_pointer_get (_pp); \
|
|
while G_UNLIKELY (!g_atomic_pointer_compare_and_exchange (_pp, _p, NULL)); \
|
|
\
|
|
if (_p) \
|
|
_destroy (_p); \
|
|
} G_STMT_END
|
|
|
|
/* These are used to clean up the output of test programs; we can just let
|
|
* them no-op in older glib.
|
|
*/
|
|
#define g_test_expect_message(log_domain, log_level, pattern)
|
|
#define g_test_assert_expected_messages()
|
|
|
|
#else
|
|
|
|
/* We build with -DGLIB_MAX_ALLOWED_VERSION set to 2.32 to make sure we don't
|
|
* accidentally use new API that we shouldn't. But we don't want warnings for
|
|
* the APIs that we emulate above.
|
|
*/
|
|
|
|
#define g_test_expect_message(domain, level, format...) \
|
|
G_STMT_START { \
|
|
G_GNUC_BEGIN_IGNORE_DEPRECATIONS \
|
|
g_test_expect_message (domain, level, format); \
|
|
G_GNUC_END_IGNORE_DEPRECATIONS \
|
|
} G_STMT_END
|
|
|
|
#define g_test_assert_expected_messages_internal(domain, file, line, func) \
|
|
G_STMT_START { \
|
|
G_GNUC_BEGIN_IGNORE_DEPRECATIONS \
|
|
g_test_assert_expected_messages_internal (domain, file, line, func); \
|
|
G_GNUC_END_IGNORE_DEPRECATIONS \
|
|
} G_STMT_END
|
|
|
|
#endif
|
|
|
|
/* g_test_initialized() is only available since glib 2.36. */
|
|
#if !GLIB_CHECK_VERSION (2, 36, 0)
|
|
#define g_test_initialized() (g_test_config_vars->test_initialized)
|
|
#endif
|
|
|
|
/* g_test_skip() is only available since glib 2.38. Add a compatibility wrapper. */
|
|
inline static void
|
|
__nmtst_g_test_skip (const gchar *msg)
|
|
{
|
|
#if GLIB_CHECK_VERSION (2, 38, 0)
|
|
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
|
|
g_test_skip (msg);
|
|
G_GNUC_END_IGNORE_DEPRECATIONS
|
|
#else
|
|
g_debug ("%s", msg);
|
|
#endif
|
|
}
|
|
#define g_test_skip __nmtst_g_test_skip
|
|
|
|
|
|
/* g_test_add_data_func_full() is only available since glib 2.34. Add a compatibility wrapper. */
|
|
inline static void
|
|
__g_test_add_data_func_full (const char *testpath,
|
|
gpointer test_data,
|
|
GTestDataFunc test_func,
|
|
GDestroyNotify data_free_func)
|
|
{
|
|
#if GLIB_CHECK_VERSION (2, 34, 0)
|
|
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
|
|
g_test_add_data_func_full (testpath, test_data, test_func, data_free_func);
|
|
G_GNUC_END_IGNORE_DEPRECATIONS
|
|
#else
|
|
g_return_if_fail (testpath != NULL);
|
|
g_return_if_fail (testpath[0] == '/');
|
|
g_return_if_fail (test_func != NULL);
|
|
|
|
g_test_add_vtable (testpath, 0, test_data, NULL,
|
|
(GTestFixtureFunc) test_func,
|
|
(GTestFixtureFunc) data_free_func);
|
|
#endif
|
|
}
|
|
#define g_test_add_data_func_full __g_test_add_data_func_full
|
|
|
|
|
|
#endif /* __NM_GLIB_COMPAT_H__ */
|