[glom/online-glom] Revert previous 'hide methods in sharedptr' patch.



commit 006ec97ec43a20e2f3d3d52d211cfb18282205a6
Author: Ben Konrath <ben bagu org>
Date:   Wed Jan 12 11:24:16 2011 +0100

    Revert previous 'hide methods in sharedptr' patch.
    
    * glom/libglom/sharedptr.h: Remove the #ifdefs as we no longer need to
    hide these methods from swig with the recently commited glom_sharedptr
    macro.

 ChangeLog                |    8 ++++++++
 glom/libglom/sharedptr.h |   12 ------------
 2 files changed, 8 insertions(+), 12 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 515a0e8..2ff4ea4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-01-12  Ben Konrath  <ben bagu org>
+
+	Revert previous 'hide methods in sharedptr' patch.
+
+	* glom/libglom/sharedptr.h: Remove the #ifdefs as we no longer need to
+	hide these methods from swig with the recently commited glom_sharedptr
+	macro.
+
 2010-12-23  Ben Konrath  <ben bagu org>
 
 	Hide some methods in sharedptr from swig.
diff --git a/glom/libglom/sharedptr.h b/glom/libglom/sharedptr.h
index e438315..f69c3a9 100644
--- a/glom/libglom/sharedptr.h
+++ b/glom/libglom/sharedptr.h
@@ -46,12 +46,10 @@ public:
   ///Take ownership
   explicit sharedptr(T_obj* pobj);
 
-#ifndef SWIG //Hide this API from swig.
   /** Take ownership.
    * This is only for internal use.
    */
   explicit sharedptr(T_obj* pobj, size_type* refcount);
-#endif //SWIG
 
   ///Share ownership
   sharedptr(const sharedptr& src);
@@ -70,10 +68,8 @@ public:
   template <class T_CastFrom>
   inline sharedptr(const sharedptr<T_CastFrom>& src);
 
-#ifndef SWIG //Hide this API from swig.
   ///Share ownership
   sharedptr& operator=(const sharedptr& src);
-#endif //SWIG
 
   /** Copy from different, but castable type).
    *
@@ -84,10 +80,8 @@ public:
 
   virtual ~sharedptr();
 
-#ifndef SWIG //Hide this API from swig.
   inline bool operator==(const sharedptr<T_obj>& src) const;
   inline bool operator!=(const sharedptr<T_obj>& src) const;
-#endif //SWIG
 
   ///Forget the instance.
   virtual void clear();
@@ -96,11 +90,9 @@ public:
    */
   inline T_obj& operator*();
 
-#ifndef SWIG //Hide this API from swig.
   /** Dereferencing.
    */
   inline const T_obj& operator*() const;
-#endif //SWIG
 
   /** Dereferencing.
    *
@@ -109,7 +101,6 @@ public:
    */
   inline T_obj* operator->() const;
 
-#ifndef SWIG //Hide this API from swig.
   /** Test whether the sharedptr<> points to any underlying instance.
    *
    * Mimics usage of ordinary pointers:
@@ -129,7 +120,6 @@ public:
    * @endcode
    */
   inline bool operator!() const;
-#endif //SWIG
 
    /** Dynamic cast to derived class.
    *
@@ -169,14 +159,12 @@ public:
   ///Get the underlying instance:
   inline T_obj* obj();
 
-#ifndef SWIG //Hide this API from swig.
   ///Get the underlying instance:
   inline const T_obj* obj() const;
 
   ///This is for internal use. You never need to use it.
   inline size_type* _get_refcount() const
   { return m_pRefCount; }
-#endif //SWIG
 
 private:
   inline void ref();



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]