SDK 0.2.3

1 files changed, 70 insertions, 70 deletions

diff --git a/LibOVR/Src/Kernel/OVR_System.cpp b/LibOVR/Src/Kernel/OVR_System.cpp
index 8eba8e2..410bfe1 100644
--- a/LibOVR/Src/Kernel/OVR_System.cpp
+++ b/LibOVR/Src/Kernel/OVR_System.cpp
@@ -1,70 +1,70 @@
-/************************************************************************************

-

-Filename    :   OVR_System.cpp

-Content     :   General kernel initialization/cleanup, including that

-                of the memory allocator.

-Created     :   September 19, 2012

-Notes       : 

-

-Copyright   :   Copyright 2012 Oculus VR, Inc. All Rights reserved.

-

-Use of this software is subject to the terms of the Oculus license

-agreement provided at the time of installation or download, or which

-otherwise accompanies this software in either electronic or hard copy form.

-

-************************************************************************************/

-

-#include "OVR_System.h"

-#include "OVR_Threads.h"

-#include "OVR_Timer.h"

-

-namespace OVR {

-

-// *****  OVR::System Implementation

-

-// Initializes System core, installing allocator.

-void System::Init(Log* log, Allocator *palloc)

-{    

-    if (!Allocator::GetInstance())

-    {

-        Log::SetGlobalLog(log);

-        Timer::initializeTimerSystem();

-        Allocator::setInstance(palloc);

-    }

-    else

-    {

-        OVR_DEBUG_LOG(("System::Init failed - duplicate call."));

-    }

-}

-

-void System::Destroy()

-{    

-    if (Allocator::GetInstance())

-    {

-        // Wait for all threads to finish; this must be done so that memory

-        // allocator and all destructors finalize correctly.

-#ifdef OVR_ENABLE_THREADS

-        Thread::FinishAllThreads();

-#endif

-

-        // Shutdown heap and destroy SysAlloc singleton, if any.

-        Allocator::GetInstance()->onSystemShutdown();

-        Allocator::setInstance(0);

-

-        Timer::shutdownTimerSystem();

-        Log::SetGlobalLog(Log::GetDefaultLog());

-    }

-    else

-    {

-        OVR_DEBUG_LOG(("System::Destroy failed - System not initialized."));

-    }

-}

-

-// Returns 'true' if system was properly initialized.

-bool System::IsInitialized()

-{

-    return Allocator::GetInstance() != 0;

-}

-

-} // OVR

-

+/************************************************************************************
+
+Filename    :   OVR_System.cpp
+Content     :   General kernel initialization/cleanup, including that
+                of the memory allocator.
+Created     :   September 19, 2012
+Notes       : 
+
+Copyright   :   Copyright 2012 Oculus VR, Inc. All Rights reserved.
+
+Use of this software is subject to the terms of the Oculus license
+agreement provided at the time of installation or download, or which
+otherwise accompanies this software in either electronic or hard copy form.
+
+************************************************************************************/
+
+#include "OVR_System.h"
+#include "OVR_Threads.h"
+#include "OVR_Timer.h"
+
+namespace OVR {
+
+// *****  OVR::System Implementation
+
+// Initializes System core, installing allocator.
+void System::Init(Log* log, Allocator *palloc)
+{    
+    if (!Allocator::GetInstance())
+    {
+        Log::SetGlobalLog(log);
+        Timer::initializeTimerSystem();
+        Allocator::setInstance(palloc);
+    }
+    else
+    {
+        OVR_DEBUG_LOG(("System::Init failed - duplicate call."));
+    }
+}
+
+void System::Destroy()
+{    
+    if (Allocator::GetInstance())
+    {
+        // Wait for all threads to finish; this must be done so that memory
+        // allocator and all destructors finalize correctly.
+#ifdef OVR_ENABLE_THREADS
+        Thread::FinishAllThreads();
+#endif
+
+        // Shutdown heap and destroy SysAlloc singleton, if any.
+        Allocator::GetInstance()->onSystemShutdown();
+        Allocator::setInstance(0);
+
+        Timer::shutdownTimerSystem();
+        Log::SetGlobalLog(Log::GetDefaultLog());
+    }
+    else
+    {
+        OVR_DEBUG_LOG(("System::Destroy failed - System not initialized."));
+    }
+}
+
+// Returns 'true' if system was properly initialized.
+bool System::IsInitialized()
+{
+    return Allocator::GetInstance() != 0;
+}
+
+} // OVR
+