Changeset 10059 for ps

Timestamp:

08/22/11 10:54:56 (13 years ago)

Author:

Jan Wassenberg

Message:

minor fixes: add missing arena.cpp; add required NONCOPYABLE annotation; fix UNUSED2 to work in the case of references.

Location:

ps/trunk/source/lib

Files:

• allocators/arena.cpp (added)
• allocators/arena.h (modified) (1 diff)
• allocators/pool.h (modified) (1 diff)
• code_annotation.h (modified) (2 diffs)
• sysdep/os/win/wsdl.cpp (modified) (1 diff)

ps/trunk/source/lib/allocators/arena.h

@@ -43 +43 @@
 class Arena
 {
+    NONCOPYABLE(Arena);
 public:
     Arena(size_t maxSize)

ps/trunk/source/lib/allocators/pool.h

@@ -44 +44 @@
 class Pool
 {
+    NONCOPYABLE(Pool);
 public:
     // (must round up because freelist stores pointers inside objects)

ps/trunk/source/lib/code_annotation.h

@@ -32 +32 @@
 
 /**
- * mark a function local variable or parameter as unused and avoid
- * the corresponding compiler warning.
- * use inside the function body, e.g. void f(int x) { UNUSED2(x); }
- **/
-#if ICC_VERSION
-// NB: #pragma unused is documented but "unrecognized" when used;
-// casting to void isn't sufficient, but the following is:
-# define UNUSED2(param) param = param
-#else
-# define UNUSED2(param) (void)param
-#endif
-
-/**
  * mark a function parameter as unused and avoid
  * the corresponding compiler warning.
@@ -50 +37 @@
  **/
 #define UNUSED(param)
+
+/**
+ * mark a function local variable or parameter as unused and avoid
+ * the corresponding compiler warning.
+ * note that UNUSED is not applicable to variable definitions that
+ * involve initialization, nor is it sufficient in cases where
+ * an argument is unused only in certain situations.
+ * example: void f(int x) { ASSERT(x == 0); UNUSED2(x); }
+ * this asserts in debug builds and avoids warnings in release.
+ **/
+#if HAVE_C99 && GCC_VERSION // _Pragma from C99, unused from GCC
+# define UNUSED2(param) _Pragma("unused " #param)
+#elif ICC_VERSION
+// ICC 12 still doesn't recognize pragma unused, casting to void
+// isn't sufficient, and self-assignment doesn't work for references.
+# define UNUSED2(param) do{ if(&param) {} } while(false)
+#else
+# define UNUSED2(param) ((void)(param))
+#endif
 
 

ps/trunk/source/lib/sysdep/os/win/wsdl.cpp

@@ -1497 +1497 @@
     // that means stdout isn't associated with a lowio handle; _close is
     // called with fd = -1. oh well, there's nothing we can do.
-    FILE* f = 0;
-    errno_t ret = _wfreopen_s(&f, OsString(pathname).c_str(), L"wt", stdout);
-    // (ignore return value - it might indicate 'file already exists' even
-    // if f is valid, which is what actually counts)
-    UNUSED2(ret);
+    FILE* f = 0;
+    // ignore return value - it might indicate 'file already exists' even
+    // if f is valid, which is what actually counts.
+    (void)_wfreopen_s(&f, OsString(pathname).c_str(), L"wt", stdout);
     if(GetLastError() == ERROR_ALREADY_EXISTS)
         SetLastError(0);