Merge commit 'refs/merge-requests/1551' of git://gitorious.org/fg/flightgear into...

[flightgear.git] / src / MultiPlayer / multiplaymgr.hxx

diff --git a/src/MultiPlayer/multiplaymgr.hxx b/src/MultiPlayer/multiplaymgr.hxx
index ab110ed3b565ca53f681ea1d6e90b0a350298ab3..eb5fc1edf004bda1570503d828a03c1ced3c3c94 100644 (file)
--- a/src/MultiPlayer/multiplaymgr.hxx
+++ b/src/MultiPlayer/multiplaymgr.hxx
@@ -58,7 +58,7 @@ public:
   struct IdPropertyList {
     unsigned id;
     const char* name;
-    SGPropertyNode::Type type;
+    simgear::props::Type type;
   };
   static const IdPropertyList sIdPropertyList[];
   static const unsigned numProperties;
@@ -86,7 +86,7 @@ private:
   void ProcessChatMsg(const MsgBuf& Msg, const netAddress& SenderAddress);
 
   /// maps from the callsign string to the FGAIMultiplayer
-  typedef std::map<std::string, osg::ref_ptr<FGAIMultiplayer> > MultiPlayerMap;
+  typedef std::map<std::string, SGSharedPtr<FGAIMultiplayer> > MultiPlayerMap;
   MultiPlayerMap mMultiPlayerMap;
 
   netSocket* mSocket;