warning fixes for Borland

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22899 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/ptr_scpd.h b/include/wx/ptr_scpd.h
index 79ed8f3f00948ec3c61d4fc1c3c96df287aed471..785b03603e07652ae0108cd26d07678900082883 100644 (file)
--- a/include/wx/ptr_scpd.h
+++ b/include/wx/ptr_scpd.h
@@ -30,22 +30,28 @@
 
 #include "wx/defs.h"
 
-/* checked deleters are used to make sure that the
-   type being deleted is really a complete type.
-   - Jesse Lovelace <jllovela@eos.ncsu.edu>
+/*
+   checked deleters are used to make sure that the type being deleted is really
+   a complete type.: otherwise sizeof() would result in a compile-time error
+
+   do { ... } while ( 0 ) construct is used to have an anonymous scope
+   (otherwise we could have name clashes between different "complete"s) but
+   still force a semicolon after the macro
 */
 
-#define wxCHECKED_DELETE(ptr)                \
-    if (true) {                                 \
-        typedef char complete[sizeof(*ptr)]; \
-        delete ptr;                          \
-    }
-
-#define wxCHECKED_DELETE_ARRAY(ptr)          \
-    if (true) {                                        \
-        typedef char complete[sizeof(*ptr)]; \
-        delete [] ptr;                       \
-    }
+#define wxCHECKED_DELETE(ptr)                                                 \
+    do                                                                        \
+    {                                                                         \
+        typedef char complete[sizeof(*ptr)];                                  \
+        delete ptr;                                                           \
+    } while ( 0 )
+
+#define wxCHECKED_DELETE_ARRAY(ptr)                                           \
+    do                                                                        \
+    {                                                                         \
+        typedef char complete[sizeof(*ptr)];                                  \
+        delete [] ptr;                                                        \
+    } while ( 0 )
 
 /* These scoped pointers are *not* assignable and cannot be used
    within a container.  Look for wxDECLARE_SHARED_PTR for this