From 9ccc0a86b1cc24973691eaaa084caaa05cb4717b Mon Sep 17 00:00:00 2001
From: Matthias Koefferlein <matthias@koefferlein.de>
Date: Mon, 17 Sep 2018 22:34:01 +0200
Subject: [PATCH] Fixed a merge issue (build was broken)

---
 src/pya/pya/pyaObject.cc | 44 ----------------------------------------
 src/pya/pya/pyaObject.h  |  5 +++++
 2 files changed, 5 insertions(+), 44 deletions(-)

diff --git a/src/pya/pya/pyaObject.cc b/src/pya/pya/pyaObject.cc
index 2c3120418..a92385bc9 100644
--- a/src/pya/pya/pyaObject.cc
+++ b/src/pya/pya/pyaObject.cc
@@ -111,50 +111,6 @@ bool CallbackFunction::operator== (const CallbackFunction &other) const
   return callable_ref () == other.callable_ref ();
 }
 
-/**
- *  @brief An adaptor class for the callback mechanism
- */
-class Callee
-  : public gsi::Callee
-{
-public:
-  /**
-   *  @brief Constructor for a Callee object pointing the to given Python object
-   */
-  Callee (PYAObjectBase *obj);
-
-  /**
-   *  @brief Destructor
-   */
-  ~Callee ();
-
-  /**
-   *  @brief Adds a callback (given by the CallbackFunction)
-   *  This method returns a callback ID which can be used to register the callback
-   *  at an GSI object.
-   */
-  int add_callback (const CallbackFunction &vf);
-
-  /**
-   *  @brief Clears all callbacks registered
-   */
-  void clear_callbacks ();
-
-  /**
-   *  @brief Implementation of the Callee interface
-   */
-  virtual void call (int id, gsi::SerialArgs &args, gsi::SerialArgs &ret) const;
-
-  /**
-   *  @brief Implementation of the Callee interface
-   */
-  virtual bool can_call () const;
-
-private:
-  PYAObjectBase *mp_obj;
-  std::vector<CallbackFunction> m_cbfuncs;
-};
-
 // --------------------------------------------------------------------------
 //  Implementation of Callee
 
diff --git a/src/pya/pya/pyaObject.h b/src/pya/pya/pyaObject.h
index e786ecf41..0c3f6026c 100644
--- a/src/pya/pya/pyaObject.h
+++ b/src/pya/pya/pyaObject.h
@@ -94,6 +94,11 @@ public:
    */
   virtual void call (int id, gsi::SerialArgs &args, gsi::SerialArgs &ret) const;
 
+  /**
+   *  @brief Implementation of the Callee interface
+   */
+  virtual bool can_call () const;
+
 private:
   PYAObjectBase *mp_obj;
   std::vector<CallbackFunction> m_cbfuncs;