remove duplicate method, use updated path for include

OSVR · Mar 10, 2016 · 78de904 · 78de904
1 parent 0d41b05
commit 78de904
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/src/osvr/Client/PureClientContext.cpp b/src/osvr/Client/PureClientContext.cpp
@@ -209,12 +209,9 @@ namespace client {
     common::Transform const &
     PureClientContext::m_getRoomToWorldTransform() const {
         return m_roomToWorld;
-
-    common::SystemComponent *PureClientContext::m_getSystemComponent() {
-        return m_systemComponent;
     }
 
-    shared_ptr<common::SystemComponent> PureClientContext::m_getSystemComponent() {
+    common::SystemComponent *PureClientContext::m_getSystemComponent() {
         return m_systemComponent;
     }
 

diff --git a/src/osvr/Client/PureClientContext.h b/src/osvr/Client/PureClientContext.h
@@ -38,7 +38,7 @@
 #include <osvr/Client/RemoteHandlerFactory.h>
 #include <osvr/Client/ClientInterfaceObjectManager.h>
 #include <osvr/Common/PathTreeOwner.h>
-#include "RemoteHandlerFactory.h"
+#include <osvr/Client/RemoteHandlerFactory.h>
 
 // Library/third-party includes
 #include <vrpn_ConnectionPtr.h>
@@ -75,7 +75,7 @@ namespace client {
 
         common::PathTree const &m_getPathTree() const override;
 
-        virtual common::SystemComponent *m_getSystemComponent();
+        common::SystemComponent *m_getSystemComponent() override;
 
         common::Transform const &m_getRoomToWorldTransform() const override;