Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(999)

Unified Diff: sky/engine/wtf/NullPtr.cpp

Issue 719063002: Revert "Remove support for MSVC" (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: sky/engine/wtf/NullPtr.cpp
diff --git a/sky/engine/core/LICENSE-APPLE b/sky/engine/wtf/NullPtr.cpp
similarity index 85%
copy from sky/engine/core/LICENSE-APPLE
copy to sky/engine/wtf/NullPtr.cpp
index f29b41c3b2a316522d0e3493a28e96a851697b2e..4f6bfa39d03c2bb6708d33a932b5762683d3275a 100644
--- a/sky/engine/core/LICENSE-APPLE
+++ b/sky/engine/wtf/NullPtr.cpp
@@ -1,4 +1,6 @@
-Copyright (C) 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
+/*
+
+Copyright (C) 2010 Apple Inc. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
@@ -19,3 +21,14 @@ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#include "config.h"
+#include "NullPtr.h"
+
+#if !(COMPILER_SUPPORTS(CXX_NULLPTR) || defined(_LIBCPP_VERSION))
+
+const std::nullptr_t nullptr;
+
+#endif

Powered by Google App Engine
This is Rietveld 408576698