[asterisk-scf-commits] asterisk-scf/integration/bridging.git branch "master" updated.

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  2d2fd75b033a7c8bc0c5438989b6a2d84d72cb93 (commit)
       via  a60dccdcda38ac4b9e129180331f2ea69e4f8c37 (commit)
      from  3fe7fe83bee6f4527f34333703419d103650943c (commit)

Summary of changes:
 cmake                |    2 +-
 src/MediaSplicer.cpp |    5 +++++
 src/MediaSplicer.h   |    3 ++-
 3 files changed, 8 insertions(+), 2 deletions(-)


- Log -----------------------------------------------------------------
commit 2d2fd75b033a7c8bc0c5438989b6a2d84d72cb93
Merge: a60dccd 3fe7fe8
Author: Brent Eagles <beagles at digium.com>
Date:   Mon Aug 30 17:49:32 2010 -0230

    Merge branch 'master' of ssh://git.asterisk.org/asterisk-scf/integration/bridging
    
    Conflicts:
    	cmake


commit a60dccdcda38ac4b9e129180331f2ea69e4f8c37
Author: Brent Eagles <beagles at digium.com>
Date:   Mon Aug 30 17:46:12 2010 -0230

    Remove auto_ptr from MediaSplicerI class to get around incomplete type issue
    under windows. It's a pimpl idiom so as long as its deleted in the envelope's
    destructor all should be well.

diff --git a/cmake b/cmake
index 98cbf4a..1095aeb 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit 98cbf4a0d71e2af47068d55a7bcbabf8616aff92
+Subproject commit 1095aeb680f1c6c2c411d80657e2c066bf7aa6d8
diff --git a/slice b/slice
index 5d80463..dcb271b 160000
--- a/slice
+++ b/slice
@@ -1 +1 @@
-Subproject commit 5d804630eb1081d200e1408644b6af22a8a751f3
+Subproject commit dcb271baaca90fa89ed6b7d4846ea458fb303943
diff --git a/src/MediaSplicer.cpp b/src/MediaSplicer.cpp
index 10eae57..92f1263 100644
--- a/src/MediaSplicer.cpp
+++ b/src/MediaSplicer.cpp
@@ -233,6 +233,11 @@ Hydra::BridgeService::MediaSplicer::MediaSplicer() :
 {
 }
 
+Hydra::BridgeService::MediaSplicer::~MediaSplicer() 
+{
+    delete mImpl;
+}
+
 Hydra::BridgeService::MediaConnectorPtr Hydra::BridgeService::MediaSplicer::connect(
   const std::string& id,
   const Hydra::Media::V1::SessionPrx& session)
diff --git a/src/MediaSplicer.h b/src/MediaSplicer.h
index f93c8b1..2c54035 100644
--- a/src/MediaSplicer.h
+++ b/src/MediaSplicer.h
@@ -23,10 +23,11 @@ namespace BridgeService
     {
     public:
         MediaSplicer();
+        ~MediaSplicer();
         MediaConnectorPtr connect(const std::string& id, const Media::V1::SessionPrx& mediaSession); 
 
     private:
-        std::auto_ptr<MediaSplicerI> mImpl;
+        MediaSplicerI* mImpl;
     };
 } // End of namespace BridgeService
 } // End of namespace Hydra

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


-- 
asterisk-scf/integration/bridging.git