Merge pull request #497 from vadz/fix-msvc-build

ras0219-msft · web-flow · commit f5db252bc607 · 2017-07-08T21:53:44.000-07:00
Fix unreachable statement warning from MSVC after ICC warning fix
diff --git a/Release/include/cpprest/json.h b/Release/include/cpprest/json.h
@@ -1383,7 +1383,12 @@ namespace json
                 return m_value == other.m_value;
             }
             __assume(0);
+            // Absence of this return statement provokes a warning from Intel
+            // compiler, but its presence results in a warning from MSVC, so
+            // we have to resort to conditional compilation to keep both happy.
+#ifdef __INTEL_COMPILER
             return false;
+#endif
         }
 
     private:

Original file line number	Diff line number	Diff line change
`@@ -1383,7 +1383,12 @@ namespace json`
`1383`	`1383`	`return m_value == other.m_value;`
`1384`	`1384`	`}`
`1385`	`1385`	`__assume(0);`
	`1386`	`+ // Absence of this return statement provokes a warning from Intel`
	`1387`	`+ // compiler, but its presence results in a warning from MSVC, so`
	`1388`	`+ // we have to resort to conditional compilation to keep both happy.`
	`1389`	`+#ifdef __INTEL_COMPILER`
`1386`	`1390`	`return false;`
	`1391`	`+#endif`
`1387`	`1392`	`}`
`1388`	`1393`
`1389`	`1394`	`private:`