object.h   object.h 
skipping to change at line 71 skipping to change at line 71
{ {
public: public:
friend class ObjectSlot_; friend class ObjectSlot_;
void add_dependency(NodeBase*); void add_dependency(NodeBase*);
void remove_dependency(NodeBase*); void remove_dependency(NodeBase*);
virtual void reference() const; virtual void reference() const;
virtual void unreference() const; virtual void unreference() const;
virtual void set_manage(); virtual void set_manage();
ObjectBase& operator=(const ObjectBase& /* o */) ObjectBase& operator=(const ObjectBase& o)
{ return *this; } { return *this; }
ObjectBase() ObjectBase()
: control_(0) {} : control_(0) {}
SIGC_CXX_EXPLICIT_COPY ObjectBase(const ObjectBase& o) SIGC_CXX_EXPLICIT_COPY ObjectBase(const ObjectBase& o)
: control_(0) {} : control_(0) {}
virtual ~ObjectBase()=0; virtual ~ObjectBase()=0;
Control_* control() const
{
return const_cast<ObjectBase *>(this)->control();
}
Control_* control() Control_* control()
{ {
if (!control_) if (!control_)
control_ = new Control_(this); control_ = new Control_(this);
return control_; return control_;
} }
private: private:
mutable Control_* control_; mutable Control_* control_;
skipping to change at line 131 skipping to change at line 135
public: public:
Ptr() Ptr()
{ assign(); } { assign(); }
Ptr(T* t) Ptr(T* t)
{ assign(t); } { assign(t); }
template <class T2> template <class T2>
Ptr(const Ptr<T2>& p2) Ptr(const Ptr<T2>& p2)
{ {
T* test_assignment_ = (T2*)0;
assign( p2.get() ); assign( p2.get() );
} }
Ptr(const Ptr& p) Ptr(const Ptr& p)
{ assign(p.get()); } { assign(p.get()); }
~Ptr() ~Ptr()
{ if (control_) control_->unref(); } { if (control_) control_->unref(); }
Ptr& operator=(T* t) Ptr& operator=(T* t)
{ reset(t); return *this; } { reset(t); return *this; }
template <class T2> template <class T2>
Ptr& operator=(const Ptr<T2>& p2) Ptr& operator=(const Ptr<T2>& p2)
{ T *test_assignment_=(T2*)0; reset(p2.get()); return *this; } { reset(p2.get()); return *this; }
Ptr& operator=(const Ptr& p) Ptr& operator=(const Ptr& p)
{ reset(p.get()); return *this; } { reset(p.get()); return *this; }
T& operator*() const { return *get(); } T& operator*() const { return *get(); }
T* operator->() const { return get(); } T* operator->() const { return get(); }
operator T*() const { return get(); } operator T*() const { return get(); }
T* get() const T* get() const
{ {
 End of changes. 4 change blocks. 
3 lines changed or deleted 6 lines changed or added


 sigcconfig.h   sigcconfig.h 
skipping to change at line 28 skipping to change at line 28
// autoconf likes to place a lot of stuff we don't want. // autoconf likes to place a lot of stuff we don't want.
#if 0 #if 0
/* Define if you have the <dlfcn.h> header file. */ /* Define if you have the <dlfcn.h> header file. */
#define HAVE_DLFCN_H 1 #define HAVE_DLFCN_H 1
/* Name of package */ /* Name of package */
#define PACKAGE "libsigc++" #define PACKAGE "libsigc++"
/* Version number of package */ /* Version number of package */
#define VERSION "1.2.5" #define VERSION "1.2.6"
#endif /* 0 */ #endif /* 0 */
#define SIGC_MAJOR_VERSION 1 #define SIGC_MAJOR_VERSION 1
#define SIGC_MINOR_VERSION 2 #define SIGC_MINOR_VERSION 2
#define SIGC_MICRO_VERSION 5 #define SIGC_MICRO_VERSION 6
// Detect common platforms // Detect common platforms
#if defined(__MWERKS__) #if defined(__MWERKS__)
#define LIBSIGC_MWERKS #define LIBSIGC_MWERKS
#elif defined(_WIN32) #elif defined(_WIN32)
// Win32 compilers have a lot of varation // Win32 compilers have a lot of varation
#if defined(__BORLANDC__) #if defined(__BORLANDC__)
#define LIBSIGC_BC #define LIBSIGC_BC
#define LIBSIGC_DLL #define LIBSIGC_DLL
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 signal.h   signal.h 
skipping to change at line 69 skipping to change at line 69
} }
SlotNode* create_slot(FuncPtr proxy); // nothrow SlotNode* create_slot(FuncPtr proxy); // nothrow
ConnectionNode* push_front(const SlotBase& s); ConnectionNode* push_front(const SlotBase& s);
ConnectionNode* push_back(const SlotBase& s); ConnectionNode* push_back(const SlotBase& s);
virtual void remove(SignalConnectionNode* c); virtual void remove(SignalConnectionNode* c);
bool empty(); bool empty();
void clear(); void clear();
void cleanup(); // nothrow void cleanup(); // nothrow
private:
void _remove(SignalConnectionNode* c);
}; };
class LIBSIGC_API SignalBase class LIBSIGC_API SignalBase
{ {
friend class SignalConnectionNode; friend class SignalConnectionNode;
private: private:
SignalBase& operator= (const SignalBase&); // no copy SignalBase& operator= (const SignalBase&); // no copy
protected: protected:
typedef SignalExec_ Exec; typedef SignalExec_ Exec;
 End of changes. 1 change blocks. 
0 lines changed or deleted 2 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/