Changeset 71

Timestamp:

Nov 21, 2005 5:01:06 PM (18 years ago)

Author:

bennylp

Message:

Fixed MSVC compilation warnings in release build

Location:

pjproject/trunk/pjlib

Files:

• build/pjlib.dsp (modified) (1 diff)
• include/pj/compat/cc_msvc.h (modified) (1 diff)
• src/pj/ioqueue_winnt.c (modified) (2 diffs)
• src/pjlib-test/test.c (modified) (1 diff)

pjproject/trunk/pjlib/build/pjlib.dsp

@@ -42 +42 @@
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MD /W4 /Zi /O2 /I "../include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "PJ_WIN32" /D "PJ_M_I386" /FR /FD /c
+# ADD CPP /nologo /MD /W4 /Zi /O2 /Ob2 /I "../include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "PJ_WIN32" /D "PJ_M_I386" /FR /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"

pjproject/trunk/pjlib/include/pj/compat/cc_msvc.h

@@ -29 +29 @@
 #endif
 
-#  pragma warning(disable: 4127)        // conditional expression is constant
-#  pragma warning(disable: 4611)        // not wise to mix setjmp with C++
-#  pragma warning(disable: 4514)        // unreferenced inline function has been removed
-#  ifdef __cplusplus
-#    define PJ_INLINE_SPECIFIER inline
-#  else
-#    define PJ_INLINE_SPECIFIER static __inline
-#  endif
-#  define PJ_THREAD_FUNC        
-#  define PJ_NORETURN           __declspec(noreturn)
-#  define PJ_ATTR_NORETURN      
+#pragma warning(disable: 4127) // conditional expression is constant
+#pragma warning(disable: 4611) // not wise to mix setjmp with C++
+#pragma warning(disable: 4514) // unref. inline function has been removed
+#ifdef NDEBUG
+#  pragma warning(disable: 4702) // unreachable code
+#  pragma warning(disable: 4710) // function is not inlined.
+#  pragma warning(disable: 4711) // function selected for auto inline expansion
+#endif
 
-#  define PJ_HAS_INT64  1
+#ifdef __cplusplus
+#  define PJ_INLINE_SPECIFIER   inline
+#else
+#  define PJ_INLINE_SPECIFIER   static __inline
+#endif
+
+#define PJ_THREAD_FUNC  
+#define PJ_NORETURN             __declspec(noreturn)
+#define PJ_ATTR_NORETURN        
+
+#define PJ_HAS_INT64    1
+
 typedef __int64 pj_int64_t;
 typedef unsigned __int64 pj_uint64_t;

pjproject/trunk/pjlib/src/pj/ioqueue_winnt.c

@@ -439 +439 @@
     generic_overlapped *pOv;
     pj_ioqueue_key_t *key;
-    pj_ssize_t size_status;
+    pj_ssize_t size_status = -1;
     BOOL rc;
 
@@ -510 +510 @@
         /* Check the connecting array (again). */
 #if PJ_HAS_TCP
+        size_status = -1;   /* make MSVC happy */
         key = check_connecting(ioqueue, &size_status);
         if (key != NULL) {

pjproject/trunk/pjlib/src/pjlib-test/test.c

@@ -189 +189 @@
         return test_inner();
     }
-    PJ_DEFAULT {
+    PJ_CATCH_ANY {
         int id = PJ_GET_EXCEPTION();
         PJ_LOG(3,("test", "FATAL: unhandled exception id %d (%s)",