projects
/
babeltrace.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanup: remove private babeltrace.h
[babeltrace.git]
/
src
/
lib
/
object.h
diff --git
a/src/lib/object.h
b/src/lib/object.h
index c3afd73f744459f6ec4beb5e2dd67b14c6a6741d..61a502f4254f1a98855c86e30cce553e161922b9 100644
(file)
--- a/
src/lib/object.h
+++ b/
src/lib/object.h
@@
-24,7
+24,7
@@
* SOFTWARE.
*/
* SOFTWARE.
*/
-#include "common/
babeltrace
.h"
+#include "common/
macros
.h"
#include "common/assert.h"
#include <stdbool.h>
#include "common/assert.h"
#include <stdbool.h>
@@
-281,7
+281,7
@@
void bt_object_get_no_null_check(const void *c_obj)
BT_ASSERT(obj);
BT_ASSERT(obj->is_shared);
BT_ASSERT(obj);
BT_ASSERT(obj->is_shared);
- if (
unlikely
(obj->parent && bt_object_get_ref_count(obj) == 0)) {
+ if (
G_UNLIKELY
(obj->parent && bt_object_get_ref_count(obj) == 0)) {
#ifdef BT_LOGV
BT_LOGV("Incrementing object's parent's reference count: "
"addr=%p, parent-addr=%p", obj, obj->parent);
#ifdef BT_LOGV
BT_LOGV("Incrementing object's parent's reference count: "
"addr=%p, parent-addr=%p", obj, obj->parent);
@@
-329,7
+329,7
@@
void bt_object_get_ref(const void *ptr)
{
struct bt_object *obj = (void *) ptr;
{
struct bt_object *obj = (void *) ptr;
- if (
unlikely
(!obj)) {
+ if (
G_UNLIKELY
(!obj)) {
return;
}
return;
}
@@
-345,7
+345,7
@@
void bt_object_put_ref(const void *ptr)
{
struct bt_object *obj = (void *) ptr;
{
struct bt_object *obj = (void *) ptr;
- if (
unlikely
(!obj)) {
+ if (
G_UNLIKELY
(!obj)) {
return;
}
return;
}
This page took
0.040213 seconds
and
4
git commands to generate.