Applied patch [ 793000 ] "unreachable code" changes in wxrc contrib util

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

diff --git a/contrib/utils/wxrc/wxrc.cpp b/contrib/utils/wxrc/wxrc.cpp
index e914e20c3c597a3481660588ac39c07a093509e9..7b74deabc69e2a61ff05de7c8ec4da8f3fca241a 100644 (file)
--- a/contrib/utils/wxrc/wxrc.cpp
+++ b/contrib/utils/wxrc/wxrc.cpp
@@ -94,7 +94,10 @@ int XmlResApp::OnRun()
     {
         case -1:
             return 0;
+            #if 0
+            // break is unreachable because of return earlier
             break;
+            #endif
 
         case 0:
             retCode = 0;
@@ -104,12 +107,19 @@ int XmlResApp::OnRun()
             else
                 CompileRes();
             return retCode;
+            #if 0
+            // break is unreachable because of return earlier
             break;
+            #endif
 
+        #if 0
+        // default return moved outside of switch to avoid warning about lack of return in function
         default:
             return 1;
             break;
+        #endif
     }
+    return 1;
 }
 
 

diff --git a/utils/wxrc/wxrc.cpp b/utils/wxrc/wxrc.cpp
index e914e20c3c597a3481660588ac39c07a093509e9..7b74deabc69e2a61ff05de7c8ec4da8f3fca241a 100644 (file)
--- a/utils/wxrc/wxrc.cpp
+++ b/utils/wxrc/wxrc.cpp
@@ -94,7 +94,10 @@ int XmlResApp::OnRun()
     {
         case -1:
             return 0;
+            #if 0
+            // break is unreachable because of return earlier
             break;
+            #endif
 
         case 0:
             retCode = 0;
@@ -104,12 +107,19 @@ int XmlResApp::OnRun()
             else
                 CompileRes();
             return retCode;
+            #if 0
+            // break is unreachable because of return earlier
             break;
+            #endif
 
+        #if 0
+        // default return moved outside of switch to avoid warning about lack of return in function
         default:
             return 1;
             break;
+        #endif
     }
+    return 1;
 }