Merge branch 'vanilla_0.5.0.1' into jogamp_0.5.0.1

Conflicts:
	LibOVR/Include/OVR_CAPI_0_5_0.h
	LibOVR/Src/CAPI/CAPI_HMDState.cpp
	LibOVR/Src/Displays/OVR_Win32_Dxgi_Display.h
	LibOVR/Src/Kernel/OVR_System.cpp
	LibOVR/Src/OVR_CAPI.cpp
	LibOVR/Src/OVR_Profile.cpp
	LibOVRKernel/Src/Kernel/OVR_ThreadsWinAPI.cpp
	LibOVRKernel/Src/Kernel/OVR_Types.h

1 files changed, 0 insertions, 150 deletions

diff --git a/LibOVR/Src/Kernel/OVR_Nullptr.h b/LibOVR/Src/Kernel/OVR_Nullptr.h
deleted file mode 100644
index a09f446..0000000
--- a/LibOVR/Src/Kernel/OVR_Nullptr.h
+++ /dev/null
@@ -1,150 +0,0 @@
-/************************************************************************************
-
-PublicHeader:   OVR_Kernel.h
-Filename    :   OVR_Nullptr.h
-Content     :   Implements C++11 nullptr for the case that the compiler doesn't.
-Created     :   June 19, 2014
-Notes       : 
-
-Copyright   :   Copyright 2014 Oculus VR, LLC All Rights reserved.
-
-Licensed under the Oculus VR Rift SDK License Version 3.2 (the "License"); 
-you may not use the Oculus VR Rift SDK except in compliance with the License, 
-which is provided at the time of installation or download, or which 
-otherwise accompanies this software in either electronic or hard copy form.
-
-You may obtain a copy of the License at
-
-http://www.oculusvr.com/licenses/LICENSE-3.2 
-
-Unless required by applicable law or agreed to in writing, the Oculus VR SDK 
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-************************************************************************************/
-
-#ifndef OVR_Nullptr_h
-#define OVR_Nullptr_h
-
-#pragma once
-
-#include "OVR_Types.h"
-
-
-//-----------------------------------------------------------------------------------
-// ***** OVR_HAVE_std_nullptr_t
-//
-// Identifies if <cstddef.h> includes std::nullptr_t. 
-//
-#if !defined(OVR_HAVE_std_nullptr_t) && defined(OVR_CPP11_ENABLED)
-    #if defined(OVR_STDLIB_LIBCPP)
-        #define OVR_HAVE_std_nullptr_t 1
-    #elif defined(OVR_STDLIB_LIBSTDCPP)
-        #if (__GLIBCXX__ >= 20110325) && (__GLIBCXX__ != 20110428) && (__GLIBCXX__ != 20120702)
-            #define OVR_HAVE_std_nullptr_t 1
-        #endif
-    #elif defined(_MSC_VER) && (_MSC_VER >= 1600) // VS2010+
-        #define OVR_HAVE_std_nullptr_t 1
-    #elif defined(__clang__)
-        #define OVR_HAVE_std_nullptr_t 1
-    #elif defined(OVR_CPP_GNUC) && (OVR_CC_VERSION >= 406) // GCC 4.6+
-        #define OVR_HAVE_std_nullptr_t 1
-    #endif
-#endif
-
-
-//-----------------------------------------------------------------------------------
-// ***** nullptr / std::nullptr_t
-//
-// Declares and defines nullptr and related types.
-//
-#if defined(OVR_CPP_NO_NULLPTR)
-    namespace std
-    {
-        class nullptr_t
-        {
-        public:
-            template <typename T>
-            operator T*() const
-                { return 0; }
-         
-            template <typename C, typename T>
-            operator T C::*() const
-                { return 0; }
-
-            #if OVR_CPP_NO_EXPLICIT_CONVERSION_OPERATORS
-                typedef void* (nullptr_t::*bool_)() const;  // 4.12,p1. We can't portably use operator bool(){ return false; } because bool 
-                operator bool_() const                      // is convertable to int which breaks other required functionality.
-                    { return false; }
-            #else
-                operator bool() const
-                    { return false; }
-            #endif
-
-        private:
-            void operator&() const; // 5.2.10,p9
-        };
-
-        inline nullptr_t nullptr_get()
-        {
-            nullptr_t n = { };
-            return n;
-        }
-
-        #if !defined(nullptr)
-            #define nullptr nullptr_get()
-        #endif
-
-    } // namespace std
-
-
-    // 5.9,p2 p4
-    // 13.6, p13
-    template <typename T>
-    inline bool operator==(T* pT, const std::nullptr_t)
-        { return pT == 0; }
-
-    template <typename T>
-    inline bool operator==(const std::nullptr_t, T* pT)
-        { return pT == 0; }
-
-    template <typename T, typename U>
-    inline bool operator==(const std::nullptr_t, T U::* pU)
-        { return pU == 0; }
-
-    template <typename T, typename U>
-    inline bool operator==(T U::* pTU, const std::nullptr_t)
-        { return pTU == 0; }
-
-    inline bool operator==(const std::nullptr_t, const std::nullptr_t)
-        { return true; }
-
-    inline bool operator!=(const std::nullptr_t, const std::nullptr_t)
-        { return false; }
-
-    inline bool operator<(const std::nullptr_t, const std::nullptr_t)
-        { return false; }
-
-    inline bool operator<=(const std::nullptr_t, const std::nullptr_t)
-        { return true; }
-
-    inline bool operator>(const std::nullptr_t, const std::nullptr_t)
-        { return false; }
-
-    inline bool operator>=(const std::nullptr_t, const std::nullptr_t)
-        { return true; }
-
-    using std::nullptr_t;
-    using std::nullptr_get;
-
-// Some compilers natively support C++11 nullptr but the standard library being used 
-// doesn't declare std::nullptr_t, in which case we provide one ourselves.
-#elif !defined(OVR_HAVE_std_nullptr_t) && !defined(OVR_CPP_NO_DECLTYPE)
-    namespace std { typedef decltype(nullptr) nullptr_t; }
-#endif
-
-
-#endif
-