[glibmm] gmmproc: No #ifdef GLIBMM_*_ENABLED in generated code
- From: Kjell Ahlstedt <kjellahl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glibmm] gmmproc: No #ifdef GLIBMM_*_ENABLED in generated code
- Date: Mon, 23 Mar 2015 19:30:31 +0000 (UTC)
commit 71a6708daebb591c0e33b23caf2b4224d04218c0
Author: Kjell Ahlstedt <kjell ahlstedt bredband net>
Date: Mon Mar 23 20:26:38 2015 +0100
gmmproc: No #ifdef GLIBMM_*_ENABLED in generated code
* gio/src/asyncinitable.ccg: Remove #ifdef GLIBMM_EXCEPTIONS_ENABLED.
* tools/m4/property.m4: No #ifdef GLIBMM_PROPERTIES_ENABLED in generated code.
* tools/m4/signal.m4:
* tools/m4/vfunc.m4: No #ifdef GLIBMM_EXCEPTIONS_ENABLED in generated code.
These preprocessor macros are always defined.
gio/src/asyncinitable.ccg | 10 ----------
tools/m4/property.m4 | 6 ------
tools/m4/signal.m4 | 13 -------------
tools/m4/vfunc.m4 | 5 -----
4 files changed, 0 insertions(+), 34 deletions(-)
---
diff --git a/gio/src/asyncinitable.ccg b/gio/src/asyncinitable.ccg
index 6a3c855..39d3f02 100644
--- a/gio/src/asyncinitable.ccg
+++ b/gio/src/asyncinitable.ccg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
/* Copyright (C) 2010 The giomm Development Team
*
* This library is free software; you can redistribute it and/or
@@ -66,10 +64,8 @@ void AsyncInitable_Class::init_async_vfunc_callback(GAsyncInitable* self,
CppObjectType *const obj = dynamic_cast<CppObjectType* const>(obj_base);
if(obj) // This can be NULL during destruction.
{
- #ifdef GLIBMM_EXCEPTIONS_ENABLED
try // Trap C++ exceptions which would normally be lost because this is a C callback.
{
- #endif //GLIBMM_EXCEPTIONS_ENABLED
// Get the slot.
Gio::SlotAsyncReady* the_slot =
static_cast<Gio::SlotAsyncReady*>(user_data);
@@ -78,13 +74,11 @@ void AsyncInitable_Class::init_async_vfunc_callback(GAsyncInitable* self,
obj->init_async_vfunc(*the_slot, Glib::wrap(cancellable, true),
io_priority);
return;
- #ifdef GLIBMM_EXCEPTIONS_ENABLED
}
catch(...)
{
Glib::exception_handlers_invoke();
}
- #endif //GLIBMM_EXCEPTIONS_ENABLED
}
}
@@ -129,19 +123,15 @@ gboolean AsyncInitable_Class::init_finish_vfunc_callback(GAsyncInitable* self,
CppObjectType *const obj = dynamic_cast<CppObjectType* const>(obj_base);
if(obj) // This can be NULL during destruction.
{
- #ifdef GLIBMM_EXCEPTIONS_ENABLED
try // Trap C++ exceptions which would normally be lost because this is a C callback.
{
- #endif //GLIBMM_EXCEPTIONS_ENABLED
// Call the virtual member method, which derived classes might override.
return static_cast<int>(obj->init_finish_vfunc(Glib::wrap(res, true)));
- #ifdef GLIBMM_EXCEPTIONS_ENABLED
}
catch(...)
{
Glib::exception_handlers_invoke();
}
- #endif //GLIBMM_EXCEPTIONS_ENABLED
}
}
diff --git a/tools/m4/property.m4 b/tools/m4/property.m4
index 119f21c..cd926b6 100644
--- a/tools/m4/property.m4
+++ b/tools/m4/property.m4
@@ -1,5 +1,3 @@
-dnl $Id$
-
dnl
dnl
dnl Code generation sections for properties
@@ -17,7 +15,6 @@ dnl Put spaces around the template parameter if necessary.
pushdef(`__PROXY_TYPE__',`dnl
Glib::PropertyProxy$4< _QUOTE($3) >'dnl
)dnl
-#ifdef GLIBMM_PROPERTIES_ENABLED
/** $6
*
* You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -26,16 +23,13 @@ ifelse($4,_ReadOnly,get,`ifelse($4,_WriteOnly,set,get or set)') the value of the
* or receive notification when the value of the property changes.
*/
__PROXY_TYPE__ property_$2`'() ifelse($4,_ReadOnly, const,);
-#endif //#GLIBMM_PROPERTIES_ENABLED
_PUSH(SECTION_CC_PROPERTYPROXIES)
ifelse(`$5',,,`_DEPRECATE_IFDEF_START
')dnl
-#ifdef GLIBMM_PROPERTIES_ENABLED
__PROXY_TYPE__ __CPPNAME__::property_$2`'() ifelse($4,_ReadOnly, const,)
{
return __PROXY_TYPE__`'(this, "$1");
}
-#endif //GLIBMM_PROPERTIES_ENABLED
ifelse(`$5',,,`_DEPRECATE_IFDEF_END
')dnl
diff --git a/tools/m4/signal.m4 b/tools/m4/signal.m4
index d84838d..34d0f22 100644
--- a/tools/m4/signal.m4
+++ b/tools/m4/signal.m4
@@ -1,4 +1,3 @@
-
#
# --------------------------- Signal Decl----------------------------
#
@@ -58,17 +57,14 @@ static $2 __CPPNAME__`'_signal_$4_callback`'(__CNAME__`'* self, _COMMA_SUFFIX($3
// Do not try to call a signal on a disassociated wrapper.
if(obj)
{
- #ifdef GLIBMM_EXCEPTIONS_ENABLED
try
{
- #endif //GLIBMM_EXCEPTIONS_ENABLED
if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot`'(data))
ifelse(`$2',void,`dnl
(*static_cast<SlotType*>(slot))($7);
',`dnl else
return _CONVERT($5,$2,`(*static_cast<SlotType*>(slot))($7)');
')dnl endif
- #ifdef GLIBMM_EXCEPTIONS_ENABLED
}
catch(...)
{
@@ -85,7 +81,6 @@ ifelse($15, `', `dnl
}
')dnl
}
- #endif //GLIBMM_EXCEPTIONS_ENABLED
}
ifelse($2,void,,`dnl else
@@ -104,13 +99,10 @@ static $2 __CPPNAME__`'_signal_$4_notify_callback`'(__CNAME__`'* self, _COMMA_SU
// Do not try to call a signal on a disassociated wrapper.
if(obj)
{
- #ifdef GLIBMM_EXCEPTIONS_ENABLED
try
{
- #endif //GLIBMM_EXCEPTIONS_ENABLED
if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot`'(data))
(*static_cast<SlotType*>(slot))($7);
- #ifdef GLIBMM_EXCEPTIONS_ENABLED
}
catch(...)
{
@@ -127,7 +119,6 @@ ifelse($12, `', `dnl
}
')dnl
}
- #endif //GLIBMM_EXCEPTIONS_ENABLED
}
typedef $2 RType;
@@ -228,10 +219,8 @@ dnl C++ vfunc on it.
CppObjectType *const obj = dynamic_cast<CppObjectType* const>(obj_base);
if(obj) // This can be NULL during destruction.
{
- #ifdef GLIBMM_EXCEPTIONS_ENABLED
try // Trap C++ exceptions which would normally be lost because this is a C callback.
{
- #endif //GLIBMM_EXCEPTIONS_ENABLED
// Call the virtual member method, which derived classes might override.
ifelse($4,void,`dnl
obj->on_$1`'($7);
@@ -239,7 +228,6 @@ ifelse($4,void,`dnl
',`dnl
return _CONVERT($3,$4,`obj->on_$1`'($7)');
')dnl
- #ifdef GLIBMM_EXCEPTIONS_ENABLED
}
catch(...)
{
@@ -256,7 +244,6 @@ ifelse($15, `', `dnl
}
')dnl
}
- #endif //GLIBMM_EXCEPTIONS_ENABLED
}
}
diff --git a/tools/m4/vfunc.m4 b/tools/m4/vfunc.m4
index 156a3a4..8cbf908 100644
--- a/tools/m4/vfunc.m4
+++ b/tools/m4/vfunc.m4
@@ -59,10 +59,8 @@ dnl C++ vfunc on it.
CppObjectType *const obj = dynamic_cast<CppObjectType* const>(obj_base);
if(obj) // This can be NULL during destruction.
{
- #ifdef GLIBMM_EXCEPTIONS_ENABLED
try // Trap C++ exceptions which would normally be lost because this is a C callback.
{
- #endif //GLIBMM_EXCEPTIONS_ENABLED
// Call the virtual member method, which derived classes might override.
ifelse($4,void,`dnl
obj->$1`'($7);
@@ -90,7 +88,6 @@ ifelse($10,keep_return,`dnl
')dnl end keep_return
')dnl end refreturn_ctype
')dnl end void
- #ifdef GLIBMM_EXCEPTIONS_ENABLED
}
catch(...)
{
@@ -111,7 +108,6 @@ ifelse($9,refreturn_ctype,`dnl
}
')dnl
}
- #endif //GLIBMM_EXCEPTIONS_ENABLED
}
}
@@ -227,4 +223,3 @@ ifelse(`$5',,,`#endif // $5
')dnl
_POP()')
-
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]