summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Hollerbach <mail@marcel-hollerbach.de>2019-02-05 14:45:51 +0100
committerMarcel Hollerbach <mail@marcel-hollerbach.de>2019-02-06 10:00:57 +0100
commit609e24eb85085eb5de5bab70208a1e3655037bbd (patch)
tree958decda90ba93fc6ae99dd7304ae6d1c8b81251
parentc2ae61ed0dd367bd589eb73c4bfe2f68dac92d23 (diff)
eo: repair EO_CLASS_POINTER macros
the function has changed, but the macro was not adjusted. Reviewed-by: Cedric BAIL <cedric.bail@free.fr> Differential Revision: https://phab.enlightenment.org/D7878
-rw-r--r--src/lib/eo/eo_ptr_indirection.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/eo/eo_ptr_indirection.h b/src/lib/eo/eo_ptr_indirection.h
index 9cde5ba0c2..33dc709d42 100644
--- a/src/lib/eo/eo_ptr_indirection.h
+++ b/src/lib/eo/eo_ptr_indirection.h
@@ -75,13 +75,13 @@ void _eo_pointer_error(const Eo *obj_id, const char *func_name, const char *file
75#define EO_CLASS_POINTER_PROXY(klass_id, klass) \ 75#define EO_CLASS_POINTER_PROXY(klass_id, klass) \
76 _Efl_Class *klass; \ 76 _Efl_Class *klass; \
77 do { \ 77 do { \
78 klass = _eo_class_pointer_get(klass_id, func_name, file, line); \ 78 klass = _eo_class_pointer_get(klass_id); \
79 } while (0) 79 } while (0)
80 80
81#define EO_CLASS_POINTER_RETURN_VAL(klass_id, klass, ret) \ 81#define EO_CLASS_POINTER_RETURN_VAL(klass_id, klass, ret) \
82 _Efl_Class *klass; \ 82 _Efl_Class *klass; \
83 do { \ 83 do { \
84 klass = _eo_class_pointer_get(klass_id, __FUNCTION__, __FILE__, __LINE__); \ 84 klass = _eo_class_pointer_get(klass_id); \
85 if (!klass) { \ 85 if (!klass) { \
86 _EO_POINTER_ERR(klass_id, "Class (%p) is an invalid ref.", klass_id); \ 86 _EO_POINTER_ERR(klass_id, "Class (%p) is an invalid ref.", klass_id); \
87 return ret; \ 87 return ret; \
@@ -91,7 +91,7 @@ void _eo_pointer_error(const Eo *obj_id, const char *func_name, const char *file
91#define EO_CLASS_POINTER_RETURN_VAL_PROXY(klass_id, klass, ret) \ 91#define EO_CLASS_POINTER_RETURN_VAL_PROXY(klass_id, klass, ret) \
92 _Efl_Class *klass; \ 92 _Efl_Class *klass; \
93 do { \ 93 do { \
94 klass = _eo_class_pointer_get(klass_id, func_name, file, line); \ 94 klass = _eo_class_pointer_get(klass_id); \
95 if (!klass) { \ 95 if (!klass) { \
96 _EO_POINTER_ERR(klass_id, "Class (%p) is an invalid ref.", klass_id); \ 96 _EO_POINTER_ERR(klass_id, "Class (%p) is an invalid ref.", klass_id); \
97 return ret; \ 97 return ret; \
@@ -101,7 +101,7 @@ void _eo_pointer_error(const Eo *obj_id, const char *func_name, const char *file
101#define EO_CLASS_POINTER_RETURN(klass_id, klass) \ 101#define EO_CLASS_POINTER_RETURN(klass_id, klass) \
102 _Efl_Class *klass; \ 102 _Efl_Class *klass; \
103 do { \ 103 do { \
104 klass = _eo_class_pointer_get(klass_id, __FUNCTION__, __FILE__, __LINE__); \ 104 klass = _eo_class_pointer_get(klass_id); \
105 if (!klass) { \ 105 if (!klass) { \
106 _EO_POINTER_ERR(klass_id, "Class (%p) is an invalid ref.", klass_id); \ 106 _EO_POINTER_ERR(klass_id, "Class (%p) is an invalid ref.", klass_id); \
107 return; \ 107 return; \
@@ -111,7 +111,7 @@ void _eo_pointer_error(const Eo *obj_id, const char *func_name, const char *file
111#define EO_CLASS_POINTER_RETURN_PROXY(klass_id, klass) \ 111#define EO_CLASS_POINTER_RETURN_PROXY(klass_id, klass) \
112 _Efl_Class *klass; \ 112 _Efl_Class *klass; \
113 do { \ 113 do { \
114 klass = _eo_class_pointer_get(klass_id, func_name, file, line); \ 114 klass = _eo_class_pointer_get(klass_id); \
115 if (!klass) { \ 115 if (!klass) { \
116 _EO_POINTER_ERR(klass_id, "Class (%p) is an invalid ref.", klass_id); \ 116 _EO_POINTER_ERR(klass_id, "Class (%p) is an invalid ref.", klass_id); \
117 return; \ 117 return; \