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

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  37173c75613532b910e8512238bfb18ed081f291 (commit)
      from  d18f95146f58bc2365de8de49085d4626aa5fb47 (commit)

Summary of changes:
 src/BridgeManagerImpl.cpp |    6 ++----
 src/BridgeManagerImpl.h   |    6 ++++--
 src/BridgeServiceConfig.h |   12 ------------
 3 files changed, 6 insertions(+), 18 deletions(-)


- Log -----------------------------------------------------------------
commit 37173c75613532b910e8512238bfb18ed081f291
Author: Brent Eagles <beagles at digium.com>
Date:   Thu Feb 10 17:19:03 2011 -0330

    Removed obsoleted/unnecessary typedef for Logger.

diff --git a/src/BridgeManagerImpl.cpp b/src/BridgeManagerImpl.cpp
index 682b606..4c78169 100644
--- a/src/BridgeManagerImpl.cpp
+++ b/src/BridgeManagerImpl.cpp
@@ -17,11 +17,9 @@
 #include <Ice/Ice.h>
 #include <IceUtil/UUID.h>
 #include <boost/thread/locks.hpp>
+#include <AsteriskSCF/logger.h>
 #include "BridgeListenerMgr.h"
 #include "BridgeManagerListenerMgr.h"
-#include <AsteriskSCF/logger.h>
-
-using namespace AsteriskSCF::System::Logging;
 
 //
 // Compiled in constants.
@@ -60,7 +58,7 @@ private:
 
 AsteriskSCF::BridgeService::BridgeManagerImpl::BridgeManagerImpl(const Ice::ObjectAdapterPtr& adapter, 
   const std::string& name, const AsteriskSCF::SessionCommunications::V1::BridgeManagerPrx& prx, 
-  const AsteriskSCF::System::Logging::LoggerPtr& logger) :
+  const AsteriskSCF::System::Logging::Logger& logger) :
     mName(name),
     mShuttingDown(false),
     mSuspended(false),
diff --git a/src/BridgeManagerImpl.h b/src/BridgeManagerImpl.h
index 5a386d8..43671fe 100644
--- a/src/BridgeManagerImpl.h
+++ b/src/BridgeManagerImpl.h
@@ -22,9 +22,11 @@
 #include "BridgeServiceConfig.h"
 #include "BridgeImpl.h"
 #include "BridgeManagerListenerMgr.h"
+#include <AsteriskSCF/logger.h>
 
 namespace AsteriskSCF
 {
+
 namespace BridgeService
 {
 class BridgeManagerImpl : public SessionCommunications::V1::BridgeManager
@@ -32,7 +34,7 @@ class BridgeManagerImpl : public SessionCommunications::V1::BridgeManager
 public:
 
     BridgeManagerImpl(const Ice::ObjectAdapterPtr& adapter, const std::string& name, const AsteriskSCF::SessionCommunications::V1::BridgeManagerPrx& prx,
-      const AsteriskSCF::System::Logging::LoggerPtr& logger);
+      const AsteriskSCF::System::Logging::Logger& logger);
     ~BridgeManagerImpl();
 
     //
@@ -68,7 +70,7 @@ private:
     Ice::ObjectAdapterPtr mAdapter;
     AsteriskSCF::SessionCommunications::V1::BridgeManagerPrx mSourceProxy;
     BridgeManagerListenerMgrPtr mListeners;
-    AsteriskSCF::System::Logging::LoggerPtr mLogger;
+    AsteriskSCF::System::Logging::Logger mLogger;
     std::vector<AsteriskSCF::SessionCommunications::V1::BridgeListenerPrx> mDefaultBridgeListeners;
 
     void reap();
diff --git a/src/BridgeServiceConfig.h b/src/BridgeServiceConfig.h
index 289892a..d0f28a3 100644
--- a/src/BridgeServiceConfig.h
+++ b/src/BridgeServiceConfig.h
@@ -22,18 +22,6 @@
 //
 namespace AsteriskSCF
 {
-namespace System
-{
-namespace Logging
-{
-    class Logger;
-    //
-    // Temporary until the logger is a reference counted entity.
-    //
-    typedef Logger& LoggerPtr; 
-
-} // End of namespace Logging
-} // End of namespace System
 
 namespace BridgeService
 {

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


-- 
asterisk-scf/release/bridging.git