diff options
Diffstat (limited to 'LibOVR/Src/Kernel/OVR_System.h')
| -rw-r--r-- | LibOVR/Src/Kernel/OVR_System.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/LibOVR/Src/Kernel/OVR_System.h b/LibOVR/Src/Kernel/OVR_System.h index 66ecfe9..daaafb4 100644 --- a/LibOVR/Src/Kernel/OVR_System.h +++ b/LibOVR/Src/Kernel/OVR_System.h @@ -7,16 +7,16 @@ Content : General kernel initialization/cleanup, including that Created : September 19, 2012 Notes : -Copyright : Copyright 2014 Oculus VR, Inc. All Rights reserved. +Copyright : Copyright 2014 Oculus VR, LLC All Rights reserved. -Licensed under the Oculus VR Rift SDK License Version 3.1 (the "License"); +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.1 +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, @@ -50,8 +50,7 @@ class SystemSingletonInternal SystemSingletonInternal* NextSingleton; // No copying allowed - SystemSingletonInternal(const SystemSingletonInternal&) {} - void operator=(const SystemSingletonInternal&) {} + OVR_NON_COPYABLE(SystemSingletonInternal); protected: SystemSingletonInternal() : @@ -59,6 +58,8 @@ protected: { } + virtual ~SystemSingletonInternal(){} + // Call this to register the destroy events // Destroy callbacks will be called in the reverse order they were registered // Note: As a rule of thumb, call this at the end of the singleton class constructor. |