[beast: 1/10] BSE: remove Bse::ImplicitBase workaround, which is not required by newer Rapicorn
- From: Tim Janik <timj src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [beast: 1/10] BSE: remove Bse::ImplicitBase workaround, which is not required by newer Rapicorn
- Date: Fri, 19 Jun 2015 16:22:50 +0000 (UTC)
commit e2abd32493e1d79caaf079a9e4d98b2a7436fc75
Author: Tim Janik <timj gnu org>
Date: Sun Nov 16 06:08:59 2014 +0100
BSE: remove Bse::ImplicitBase workaround, which is not required by newer Rapicorn
bse/Makefile.am | 6 ++----
bse/bseutils.hh | 16 ----------------
2 files changed, 2 insertions(+), 20 deletions(-)
---
diff --git a/bse/Makefile.am b/bse/Makefile.am
index 75a36dc..6c6a456 100644
--- a/bse/Makefile.am
+++ b/bse/Makefile.am
@@ -299,14 +299,12 @@ bseclientapi.cc: $(srcdir)/../bse/bseapi.idl $(AUXTYPES_PY)
GENERATED += bseclientapi.cc
bseserverapi.hh: $(srcdir)/bseapi.idl $(AUXTYPES_PY)
$(AM_V_GEN)
- $(Q) ${AIDACC} -x CxxStub -x $(AUXTYPES_PY) -G serverhh -G cppguard=__BST_BSESERVERAPI_HH_ \
- -G iface-base=Bse::ImplicitBase $< -o xgen-$(@F)
+ $(Q) ${AIDACC} -x CxxStub -x $(AUXTYPES_PY) -G serverhh -G cppguard=__BST_BSESERVERAPI_HH_ $< -o
xgen-$(@F)
$(Q) mv xgen-$(@F) $@
GENERATED += bseserverapi.hh
bseserverapi.cc: $(srcdir)/bseapi.idl $(AUXTYPES_PY)
$(AM_V_GEN)
- $(Q) ${AIDACC} -x CxxStub -x $(AUXTYPES_PY) -G servercc -G cppguard=__BST_BSESERVERAPI_CC_ \
- -G iface-base=Bse::ImplicitBase $< -o xgen-$(@F)
+ $(Q) ${AIDACC} -x CxxStub -x $(AUXTYPES_PY) -G servercc -G cppguard=__BST_BSESERVERAPI_CC_ $< -o
xgen-$(@F)
$(Q) patch -f < $(srcdir)/patch-bseserverapi.cc.diff || true
$(Q) mv xgen-$(@F) $@
GENERATED += bseserverapi.cc
diff --git a/bse/bseutils.hh b/bse/bseutils.hh
index 210d490..4c34452 100644
--- a/bse/bseutils.hh
+++ b/bse/bseutils.hh
@@ -4,22 +4,6 @@
#include <bse/bseclientapi.hh>
#include <rapicorn-core.hh>
-
-namespace Bse {
-
-/// IDL API base class until Rapicorn supports ImplicitBaseP out of the box.
-class ImplicitBase : public virtual Rapicorn::Aida::ImplicitBase,
- public virtual std::enable_shared_from_this<ImplicitBase> {
-public:
- template<class Class, typename std::enable_if<std::is_base_of<ImplicitBase, Class>::value>::type* =
nullptr>
- static std::shared_ptr<Class> shared_ptr (Class *object) ///< Wrap ImplicitBase or derived type into a
std::shared_ptr<>().
- {
- return object ? std::shared_ptr<Class> (object->shared_from_this()) : std::shared_ptr<Class>();
- }
-};
-
-} // Bse
-
#include <bse/bseserverapi.hh>
#include <bse/bseenums.hh>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]