From c87b737ca1076f952bb704e8cf735c07325c3483 Mon Sep 17 00:00:00 2001
From: Nick Lockwood <nicklockwood@fb.com>
Date: Mon, 23 May 2016 08:27:14 -0700
Subject: [PATCH] Fixed tests

Reviewed By: bestander

Differential Revision: D3334669

fbshipit-source-id: ba0ae2ec5ea06c27d40ceed3ca8bf7a9da27dda9
---
 Examples/UIExplorer/UIExplorerUnitTests/RCTImageLoaderTests.m | 4 ++--
 React/React.xcodeproj/project.pbxproj                         | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Examples/UIExplorer/UIExplorerUnitTests/RCTImageLoaderTests.m b/Examples/UIExplorer/UIExplorerUnitTests/RCTImageLoaderTests.m
index 5a7cc12bd..e67edb0b4 100644
--- a/Examples/UIExplorer/UIExplorerUnitTests/RCTImageLoaderTests.m
+++ b/Examples/UIExplorer/UIExplorerUnitTests/RCTImageLoaderTests.m
@@ -107,7 +107,7 @@ RCTDefineImageDecoder(RCTImageLoaderTestsDecoder2)
     XCTAssertEqualObjects(decodedImage, image);
     XCTAssertNil(decodeError);
   }];
-  XCTAssertNil(cancelBlock);
+  XCTAssertNotNil(cancelBlock);
 }
 
 - (void)testImageLoaderUsesImageDecoderWithHighestPriority
@@ -136,7 +136,7 @@ RCTDefineImageDecoder(RCTImageLoaderTestsDecoder2)
     XCTAssertEqualObjects(decodedImage, image);
     XCTAssertNil(decodeError);
   }];
-  XCTAssertNil(cancelBlock);
+  XCTAssertNotNil(cancelBlock);
 }
 
 @end
diff --git a/React/React.xcodeproj/project.pbxproj b/React/React.xcodeproj/project.pbxproj
index 9173e9bbb..c967aea85 100644
--- a/React/React.xcodeproj/project.pbxproj
+++ b/React/React.xcodeproj/project.pbxproj
@@ -859,6 +859,7 @@
 		83CBBA401A601D0F00E9B192 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CLANG_CXX_LANGUAGE_STANDARD = "c++14";
 				CLANG_STATIC_ANALYZER_MODE = deep;
 				GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
 				GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
@@ -876,6 +877,7 @@
 		83CBBA411A601D0F00E9B192 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CLANG_CXX_LANGUAGE_STANDARD = "c++14";
 				CLANG_STATIC_ANALYZER_MODE = deep;
 				GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
 				GCC_WARN_ABOUT_MISSING_NEWLINE = YES;