No changes, just move time functions from wx/stopwatch.h to wx/time.h.

[wxWidgets.git] / include / wx / scopedptr.h

diff --git a/include/wx/scopedptr.h b/include/wx/scopedptr.h
index 515c7fc383f1f648cc6a0288314440132af862af..f31a4ef036da529fe5399029fae1d0085b5c1e39 100644 (file)
--- a/include/wx/scopedptr.h
+++ b/include/wx/scopedptr.h
@@ -43,7 +43,7 @@ public:
 
     wxEXPLICIT wxScopedPtr(T * ptr = NULL) : m_ptr(ptr) { }
 
 
     wxEXPLICIT wxScopedPtr(T * ptr = NULL) : m_ptr(ptr) { }
 

-    ~wxScopedPtr() { delete m_ptr; }
+    ~wxScopedPtr() { wxCHECKED_DELETE(m_ptr); }

 
     // test for pointer validity: defining conversion to unspecified_bool_type
     // and not more obvious bool to avoid implicit conversions to integer types
 
     // test for pointer validity: defining conversion to unspecified_bool_type
     // and not more obvious bool to avoid implicit conversions to integer types


@@ -63,7 +63,7 @@ public:
     {
         if ( ptr != m_ptr )
         {
     {
         if ( ptr != m_ptr )
         {

-            delete m_ptr;
+            wxCHECKED_DELETE(m_ptr);

             m_ptr = ptr;
         }
     }
             m_ptr = ptr;
         }
     }


@@ -129,14 +129,7 @@ public:                             \
                                     \
     ~name();                        \
                                     \
                                     \
     ~name();                        \
                                     \

-    void reset(T * ptr = NULL)      \
-    {                               \
-        if (m_ptr != ptr)           \
-        {                           \
-            delete m_ptr;           \
-            m_ptr = ptr;            \
-        }                           \
-    }                               \
+    void reset(T * ptr = NULL);     \

                                     \
     T *release()                    \
     {                               \
                                     \
     T *release()                    \
     {                               \


@@ -171,6 +164,14 @@ public:                             \
 };
 
 #define wxDEFINE_SCOPED_PTR(T, name)\
 };
 
 #define wxDEFINE_SCOPED_PTR(T, name)\

+void name::reset(T * ptr)           \
+{                                   \
+    if (m_ptr != ptr)               \
+    {                               \
+        wxCHECKED_DELETE(m_ptr);    \
+        m_ptr = ptr;                \
+    }                               \
+}                                   \

 name::~name()                       \
 {                                   \
     wxCHECKED_DELETE(m_ptr);        \
 name::~name()                       \
 {                                   \
     wxCHECKED_DELETE(m_ptr);        \