From 49729815ebc8affda78f3e0880ec7e4076eb6abe Mon Sep 17 00:00:00 2001
From: jules <jules@rawmaterialsoftware.com>
Date: Wed, 3 Oct 2012 21:02:01 +0100
Subject: [PATCH] Precautionary undef-ing of noexcept and nullptr.

---
 modules/juce_core/system/juce_PlatformDefs.h | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/modules/juce_core/system/juce_PlatformDefs.h b/modules/juce_core/system/juce_PlatformDefs.h
index df9c5cb055..8ccde8d5f4 100644
--- a/modules/juce_core/system/juce_PlatformDefs.h
+++ b/modules/juce_core/system/juce_PlatformDefs.h
@@ -316,6 +316,9 @@ namespace juce
 //==============================================================================
 // Declare some fake versions of nullptr and noexcept, for older compilers:
 #if ! (DOXYGEN || JUCE_COMPILER_SUPPORTS_NOEXCEPT)
+ #ifdef noexcept
+  #undef noexcept
+ #endif
  #define noexcept  throw()
  #if defined (_MSC_VER) && _MSC_VER > 1600
   #define _ALLOW_KEYWORD_MACROS 1 // (to stop VC2012 complaining)
@@ -323,6 +326,9 @@ namespace juce
 #endif
 
 #if ! (DOXYGEN || JUCE_COMPILER_SUPPORTS_NULLPTR)
+ #ifdef nullptr
+  #undef nullptr
+ #endif
  #define nullptr (0)
 #endif