From 78de9043a4b8ae986e9ddbe4fab66049ee5e9dac Mon Sep 17 00:00:00 2001
From: Georgiy Frolov <gfrolov@sensics.com>
Date: Thu, 10 Mar 2016 16:22:55 -0500
Subject: [PATCH] remove duplicate method, use updated path for include

---
 src/osvr/Client/PureClientContext.cpp | 5 +----
 src/osvr/Client/PureClientContext.h   | 4 ++--
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/osvr/Client/PureClientContext.cpp b/src/osvr/Client/PureClientContext.cpp
index 653ec7742..dafc57d2e 100644
--- 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
index c437415b6..477a7838d 100644
--- 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;