Commit 00a9d30b authored by Matthias Clasen's avatar Matthias Clasen

Use G_LIKELY without surrounding parentheses in g_assert() and

	* glib/gmessages.h: Use G_LIKELY without surrounding parentheses
	in g_assert() and g_return_[val]_if_fail() so that we always trigger
	the gcc warning about "assignment used as truth value".

	* glib/gmacros.h: Always put parentheses in G_LIKELY and G_UNLIKELY.
parent 3d919518
2002-11-27 Matthias Clasen <maclas@gmx.de>
* glib/gmessages.h: Use G_LIKELY without surrounding parentheses
in g_assert() and g_return_[val]_if_fail() so that we always trigger
the gcc warning about "assignment used as truth value".
* glib/gmacros.h: Always put parentheses in G_LIKELY and G_UNLIKELY.
2002-11-26 Matthias Clasen <maclas@gmx.de>
* glib/gmessages.h: Only use G_LIKELY in g_assert() and
......
2002-11-27 Matthias Clasen <maclas@gmx.de>
* glib/gmessages.h: Use G_LIKELY without surrounding parentheses
in g_assert() and g_return_[val]_if_fail() so that we always trigger
the gcc warning about "assignment used as truth value".
* glib/gmacros.h: Always put parentheses in G_LIKELY and G_UNLIKELY.
2002-11-26 Matthias Clasen <maclas@gmx.de>
* glib/gmessages.h: Only use G_LIKELY in g_assert() and
......
2002-11-27 Matthias Clasen <maclas@gmx.de>
* glib/gmessages.h: Use G_LIKELY without surrounding parentheses
in g_assert() and g_return_[val]_if_fail() so that we always trigger
the gcc warning about "assignment used as truth value".
* glib/gmacros.h: Always put parentheses in G_LIKELY and G_UNLIKELY.
2002-11-26 Matthias Clasen <maclas@gmx.de>
* glib/gmessages.h: Only use G_LIKELY in g_assert() and
......
2002-11-27 Matthias Clasen <maclas@gmx.de>
* glib/gmessages.h: Use G_LIKELY without surrounding parentheses
in g_assert() and g_return_[val]_if_fail() so that we always trigger
the gcc warning about "assignment used as truth value".
* glib/gmacros.h: Always put parentheses in G_LIKELY and G_UNLIKELY.
2002-11-26 Matthias Clasen <maclas@gmx.de>
* glib/gmessages.h: Only use G_LIKELY in g_assert() and
......
2002-11-27 Matthias Clasen <maclas@gmx.de>
* glib/gmessages.h: Use G_LIKELY without surrounding parentheses
in g_assert() and g_return_[val]_if_fail() so that we always trigger
the gcc warning about "assignment used as truth value".
* glib/gmacros.h: Always put parentheses in G_LIKELY and G_UNLIKELY.
2002-11-26 Matthias Clasen <maclas@gmx.de>
* glib/gmessages.h: Only use G_LIKELY in g_assert() and
......
2002-11-27 Matthias Clasen <maclas@gmx.de>
* glib/gmessages.h: Use G_LIKELY without surrounding parentheses
in g_assert() and g_return_[val]_if_fail() so that we always trigger
the gcc warning about "assignment used as truth value".
* glib/gmacros.h: Always put parentheses in G_LIKELY and G_UNLIKELY.
2002-11-26 Matthias Clasen <maclas@gmx.de>
* glib/gmessages.h: Only use G_LIKELY in g_assert() and
......
2002-11-27 Matthias Clasen <maclas@gmx.de>
* glib/gmessages.h: Use G_LIKELY without surrounding parentheses
in g_assert() and g_return_[val]_if_fail() so that we always trigger
the gcc warning about "assignment used as truth value".
* glib/gmacros.h: Always put parentheses in G_LIKELY and G_UNLIKELY.
2002-11-26 Matthias Clasen <maclas@gmx.de>
* glib/gmessages.h: Only use G_LIKELY in g_assert() and
......
......@@ -222,8 +222,8 @@
_g_boolean_var_ = 0; \
_g_boolean_var_; \
})
#define G_LIKELY(expr) __builtin_expect (_G_BOOLEAN_EXPR(expr), 1)
#define G_UNLIKELY(expr) __builtin_expect (_G_BOOLEAN_EXPR(expr), 0)
#define G_LIKELY(expr) (__builtin_expect (_G_BOOLEAN_EXPR(expr), 1))
#define G_UNLIKELY(expr) (__builtin_expect (_G_BOOLEAN_EXPR(expr), 0))
#else
#define G_LIKELY(expr) (expr)
#define G_UNLIKELY(expr) (expr)
......
......@@ -198,11 +198,11 @@ GPrintFunc g_set_printerr_handler (GPrintFunc func);
#else /* !G_DISABLE_ASSERT */
#if defined(__GNUC__) && (__GNUC__ > 2) && defined(__OPTIMIZE__)
#ifdef __GNUC__
#define g_assert(expr) G_STMT_START{ \
if (!G_LIKELY (expr)) \
g_log (G_LOG_DOMAIN, \
if G_LIKELY(expr) { } else \
g_log (G_LOG_DOMAIN, \
G_LOG_LEVEL_ERROR, \
"file %s: line %d (%s): assertion failed: (%s)", \
__FILE__, \
......@@ -250,10 +250,10 @@ GPrintFunc g_set_printerr_handler (GPrintFunc func);
#else /* !G_DISABLE_CHECKS */
#if defined(__GNUC__) && (__GNUC__ > 2) && defined(__OPTIMIZE__)
#ifdef __GNUC__
#define g_return_if_fail(expr) G_STMT_START{ \
if (!G_LIKELY (expr)) \
if G_LIKELY(expr) { } else \
{ \
g_log (G_LOG_DOMAIN, \
G_LOG_LEVEL_CRITICAL, \
......@@ -266,7 +266,7 @@ GPrintFunc g_set_printerr_handler (GPrintFunc func);
}; }G_STMT_END
#define g_return_val_if_fail(expr,val) G_STMT_START{ \
if (!G_LIKELY (expr)) \
if G_LIKELY(expr) { } else \
{ \
g_log (G_LOG_DOMAIN, \
G_LOG_LEVEL_CRITICAL, \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment