Merge pull request #17708 from mikeash/fix-nullptr-bool-conversion-warning

mikeash · web-flow · commit 8d9345bf3d32 · 2018-07-10T17:45:32.000-04:00
[Runtime] Fix warning about implicitly converting nullptr to bool in CompatibilityOverride.cpp tests.
diff --git a/unittests/runtime/CompatibilityOverride.cpp b/unittests/runtime/CompatibilityOverride.cpp
@@ -31,7 +31,7 @@ bool Ran;
     if (!EnableOverride)                                            \
       return originalImpl namedArgs;                                \
     Ran = true;                                                     \
-    return nullptr;                                                 \
+    return (ret)0;                                                  \
   }
 #include "../../stdlib/public/runtime/CompatibilityOverride.def"
 

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ bool Ran;`
`31`	`31`	`if (!EnableOverride) \`
`32`	`32`	`return originalImpl namedArgs; \`
`33`	`33`	`Ran = true; \`
`34`		`- return nullptr; \`
	`34`	`+ return (ret)0; \`
`35`	`35`	`}`
`36`	`36`	`#include "../../stdlib/public/runtime/CompatibilityOverride.def"`
`37`	`37`