[asterisk-scf-commits] asterisk-scf/integration/media_rtp_pjmedia.git branch "modular-transport-refactor" updated.

[Commits to the Asterisk SCF project code repositories]

branch "modular-transport-refactor" has been updated
       via  6e4cfb8aaa727ce2af9b895b49ce168a4a78b5e8 (commit)
      from  62687095eb842f9c22782fffbfa23f8c61e0de24 (commit)

Summary of changes:
 src/ICETransport.cpp |    2 +-
 src/ICETransport.h   |   11 +++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)


- Log -----------------------------------------------------------------
commit 6e4cfb8aaa727ce2af9b895b49ce168a4a78b5e8
Author: Brent Eagles <beagles at digium.com>
Date:   Tue Jun 28 12:15:19 2011 -0230

    Fix windows build issues.

diff --git a/src/ICETransport.cpp b/src/ICETransport.cpp
index 4f9a573..a43ad19 100644
--- a/src/ICETransport.cpp
+++ b/src/ICETransport.cpp
@@ -56,7 +56,7 @@ public:
         mAdapter(adapter),
         mId(id),
         mShuttingDown(false),
-        mNATType(Unknown),
+        mNATType(AsteriskSCF::System::NAT::V1::Unknown),
         mRole(UndefinedRole)
     {
     }
diff --git a/src/ICETransport.h b/src/ICETransport.h
index 939f4e1..0c7851a 100644
--- a/src/ICETransport.h
+++ b/src/ICETransport.h
@@ -21,6 +21,7 @@
 #include "PJMediaEnvironment.h"
 #include <Ice/PropertiesF.h>
 #include <boost/shared_ptr.hpp>
+#include <boost/enable_shared_from_this.hpp>
 #include "NATModule.h"
 
 //
@@ -40,7 +41,7 @@ typedef boost::shared_ptr<ICETransport> ICETransportPtr;
 typedef boost::shared_ptr<pjmedia_ice_cb> PJICECallbackPtr;
 typedef boost::shared_ptr<pj_sockaddr> PJSockAddrPtr;
 
-class ICETransport : public PJMediaTransport, public boost::enable_shared_from_this<ICETransport>
+class ICETransport : public boost::enable_shared_from_this<ICETransport>,  public PJMediaTransport
 {
 public:
 
@@ -54,7 +55,12 @@ public:
     AsteriskSCF::Helpers::AddressPtr remoteAddress();
     void addFacets(const Ice::ObjectAdapterPtr& adapter, const Ice::Identity& id);
 
-    static ICETransportPtr create(const PJMediaEndpointPtr& ep, const PJMediaEnvironmentPtr& configObject);
+    /**
+     * The Microsoft VS 2010 C++ compiler doesn't like the forward declaration of ICETransport 
+     * before the enable_shared_from_this<> base class/template instantiation.
+     **/
+    static ICETransportPtr
+        create(const PJMediaEndpointPtr& ep, const PJMediaEnvironmentPtr& configObject);
 
 private:
     boost::shared_mutex mLock;
@@ -78,5 +84,6 @@ private:
     void operator=(const ICETransport&);
 };
 
+
 } /* End of namespace PJMediaRTP */
 } /* End of namespace AsteriskSCF */

-----------------------------------------------------------------------


-- 
asterisk-scf/integration/media_rtp_pjmedia.git