Changeset 262 for trunk/VUT/GtpVisibilityPreprocessor/src/common.h

Timestamp:

09/09/05 15:03:48 (19 years ago)

Author:

mattausch

Message:

debugged bsp

File:

• trunk/VUT/GtpVisibilityPreprocessor/src/common.h (modified) (1 diff)

trunk/VUT/GtpVisibilityPreprocessor/src/common.h

@@ -128 +128 @@
 
 #ifndef DEL_PTR
-#define DEL_PTR(ptr) while (0) {if (ptr) {delete (ptr); (ptr) = NULL;}}
-#endif
-
+#define DEL_PTR(ptr) do {if (ptr) {        \
+                           delete (ptr);   \
+                                                   (ptr) = 0;}}    \
+                     while (0)
+#endif
+// Clears a container (i.e., a vector of pointers) and deletes the pointers
 #ifndef CLEAR_CONTAINER
-#define CLEAR_CONTAINER(co) while (!co.empty()) {delete co.back(); co.pop_back();}
+#define CLEAR_CONTAINER(co) do { while (!(co).empty()) {   \
+                                                           DEL_PTR((co).back());     \
+                                                                   (co).pop_back();}}      \
+                                                        while (0)
 #endif