[asterisk-scf-commits] asterisk-scf/integration/sip.git branch "ice-util-restructure" updated.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Thu Apr 28 13:40:56 CDT 2011
branch "ice-util-restructure" has been updated
via d9b3670f37e829d20d4698f52b3e470816e9707c (commit)
from 21ea5c24cbcdb84971e5b0667a1562d1a6415e0f (commit)
Summary of changes:
src/PJSipLoggingModule.cpp | 4 ++--
src/PJSipManager.cpp | 3 ++-
src/PJSipManager.h | 4 ++--
src/PJSipModule.cpp | 5 +++--
src/PJSipSessionModule.cpp | 15 ++++++++-------
src/SipConfiguration.cpp | 6 +++---
src/SipEndpoint.cpp | 8 +++-----
src/SipEndpoint.h | 13 +++++++------
src/SipEndpointFactory.h | 3 +--
src/SipSession.cpp | 10 +++++-----
src/SipSession.h | 14 +++++++-------
src/SipSessionManagerApp.cpp | 3 ++-
src/SipSessionManagerEndpointLocator.cpp | 6 +++---
src/SipSessionManagerEndpointLocator.h | 4 ++--
src/SipSessionManagerEventPublisher.cpp | 4 ++--
src/SipStateReplicator.h | 4 ++--
src/SipStateReplicatorApp.cpp | 3 ++-
src/SipStateReplicatorListener.cpp | 10 +++++-----
18 files changed, 61 insertions(+), 58 deletions(-)
- Log -----------------------------------------------------------------
commit d9b3670f37e829d20d4698f52b3e470816e9707c
Author: Brent Eagles <beagles at digium.com>
Date: Thu Apr 28 16:10:43 2011 -0230
Header file reordering to address winsock2 redefinition issues.
diff --git a/src/PJSipLoggingModule.cpp b/src/PJSipLoggingModule.cpp
index c94dec1..acfe04f 100644
--- a/src/PJSipLoggingModule.cpp
+++ b/src/PJSipLoggingModule.cpp
@@ -14,10 +14,10 @@
* at the top of the source tree.
*/
-#include <AsteriskSCF/logger.h>
-
#include "PJSipLoggingModule.h"
+#include <AsteriskSCF/logger.h>
+
using namespace AsteriskSCF::System::Logging;
namespace
diff --git a/src/PJSipManager.cpp b/src/PJSipManager.cpp
index 908904f..35a5c12 100644
--- a/src/PJSipManager.cpp
+++ b/src/PJSipManager.cpp
@@ -13,10 +13,11 @@
* the GNU General Public License Version 2. See the LICENSE.txt file
* at the top of the source tree.
*/
+
+#include "PJSipManager.h"
#include <AsteriskSCF/logger.h>
#include <boost/lexical_cast.hpp>
-#include "PJSipManager.h"
using namespace AsteriskSCF::System::Logging;
diff --git a/src/PJSipManager.h b/src/PJSipManager.h
index d4e66d0..bd084a0 100644
--- a/src/PJSipManager.h
+++ b/src/PJSipManager.h
@@ -18,11 +18,11 @@
#include <vector>
-#include <Ice/Ice.h>
-
#include <pjlib.h>
#include <pjsip.h>
+#include <Ice/Ice.h>
+
#include <boost/shared_ptr.hpp>
#include <AsteriskSCF/Discovery/SmartProxy.h>
diff --git a/src/PJSipModule.cpp b/src/PJSipModule.cpp
index 0465a50..b545251 100644
--- a/src/PJSipModule.cpp
+++ b/src/PJSipModule.cpp
@@ -13,11 +13,12 @@
* the GNU General Public License Version 2. See the LICENSE.txt file
* at the top of the source tree.
*/
-#include <AsteriskSCF/logger.h>
-#include <IceUtil/UUID.h>
#include "PJSipModule.h"
+#include <AsteriskSCF/logger.h>
+#include <IceUtil/UUID.h>
+
using namespace AsteriskSCF::System::Logging;
namespace
diff --git a/src/PJSipSessionModule.cpp b/src/PJSipSessionModule.cpp
index 868670a..0876f70 100644
--- a/src/PJSipSessionModule.cpp
+++ b/src/PJSipSessionModule.cpp
@@ -13,13 +13,6 @@
* the GNU General Public License Version 2. See the LICENSE.txt file
* at the top of the source tree.
*/
-#include <IceUtil/UUID.h>
-
-#include <AsteriskSCF/Core/Endpoint/EndpointIf.h>
-#include <AsteriskSCF/Core/Routing/RoutingIf.h>
-#include <AsteriskSCF/SessionCommunications/SessionCommunicationsIf.h>
-#include <AsteriskSCF/Media/MediaIf.h>
-#include <AsteriskSCF/logger.h>
#include "PJSipSessionModule.h"
#include "SipEndpoint.h"
@@ -28,6 +21,14 @@
#include "PJSipManager.h"
#include "SipStateReplicator.h"
+#include <IceUtil/UUID.h>
+
+#include <AsteriskSCF/Core/Endpoint/EndpointIf.h>
+#include <AsteriskSCF/Core/Routing/RoutingIf.h>
+#include <AsteriskSCF/SessionCommunications/SessionCommunicationsIf.h>
+#include <AsteriskSCF/Media/MediaIf.h>
+#include <AsteriskSCF/logger.h>
+
using namespace AsteriskSCF::System::Logging;
namespace
diff --git a/src/SipConfiguration.cpp b/src/SipConfiguration.cpp
index baac220..c437aa8 100644
--- a/src/SipConfiguration.cpp
+++ b/src/SipConfiguration.cpp
@@ -14,14 +14,14 @@
* at the top of the source tree.
*/
+#include <pjlib.h>
+#include <pjsip.h>
+
#include <IceUtil/UUID.h>
#include <boost/thread.hpp>
#include <boost/shared_ptr.hpp>
-#include <pjlib.h>
-#include <pjsip.h>
-
#include <AsteriskSCF/System/Component/ConfigurationIf.h>
#include "SipConfigurationIf.h"
diff --git a/src/SipEndpoint.cpp b/src/SipEndpoint.cpp
index 50d740e..e066cd4 100644
--- a/src/SipEndpoint.cpp
+++ b/src/SipEndpoint.cpp
@@ -13,17 +13,15 @@
* the GNU General Public License Version 2. See the LICENSE.txt file
* at the top of the source tree.
*/
-
+#include "PJSipManager.h"
+#include "SipEndpointFactory.h"
+#include "SipSession.h"
#include <Ice/Ice.h>
#include <IceUtil/UUID.h>
#include <AsteriskSCF/Core/Discovery/ServiceLocatorIf.h>
#include <AsteriskSCF/logger.h>
-#include "PJSipManager.h"
-#include "SipEndpointFactory.h"
-#include "SipSession.h"
-
using namespace AsteriskSCF::System::Logging;
namespace
diff --git a/src/SipEndpoint.h b/src/SipEndpoint.h
index fc3aa21..1eb9680 100644
--- a/src/SipEndpoint.h
+++ b/src/SipEndpoint.h
@@ -16,6 +16,13 @@
#pragma once
+#include <pjsip.h>
+#include <pjmedia.h>
+#include <pjsip_ua.h>
+#include <pjsip_simple.h>
+#include <pjlib-util.h>
+#include <pjlib.h>
+
#include <Ice/Ice.h>
#include <boost/thread.hpp>
@@ -28,12 +35,6 @@
#include "SipSession.h"
-#include <pjsip.h>
-#include <pjmedia.h>
-#include <pjsip_ua.h>
-#include <pjsip_simple.h>
-#include <pjlib-util.h>
-#include <pjlib.h>
namespace AsteriskSCF
{
diff --git a/src/SipEndpointFactory.h b/src/SipEndpointFactory.h
index 6431604..48cfd97 100644
--- a/src/SipEndpointFactory.h
+++ b/src/SipEndpointFactory.h
@@ -16,13 +16,12 @@
#pragma once
+#include "SipEndpoint.h"
#include <Ice/Ice.h>
#include <boost/enable_shared_from_this.hpp>
#include <AsteriskSCF/Core/Endpoint/EndpointIf.h>
-#include "SipEndpoint.h"
-
namespace AsteriskSCF
{
namespace SipSessionManager
diff --git a/src/SipSession.cpp b/src/SipSession.cpp
index 0eafdfc..2b36d1f 100644
--- a/src/SipSession.cpp
+++ b/src/SipSession.cpp
@@ -14,6 +14,11 @@
* at the top of the source tree.
*/
+#include "PJSipManager.h"
+#include "SipEndpointFactory.h"
+#include "SipEndpoint.h"
+#include "SipSession.h"
+
#include <Ice/Ice.h>
#include <IceUtil/UUID.h>
@@ -22,11 +27,6 @@
#include <AsteriskSCF/logger.h>
-#include "PJSipManager.h"
-#include "SipEndpointFactory.h"
-#include "SipEndpoint.h"
-#include "SipSession.h"
-
using namespace AsteriskSCF::System::Logging;
namespace
diff --git a/src/SipSession.h b/src/SipSession.h
index 3596260..643e70e 100644
--- a/src/SipSession.h
+++ b/src/SipSession.h
@@ -16,6 +16,13 @@
#pragma once
+#include <pjsip.h>
+#include <pjmedia.h>
+#include <pjsip_ua.h>
+#include <pjsip_simple.h>
+#include <pjlib-util.h>
+#include <pjlib.h>
+
#include <Ice/Ice.h>
#include <boost/thread.hpp>
@@ -29,13 +36,6 @@
#include <SipStateReplicationIf.h>
-#include <pjsip.h>
-#include <pjmedia.h>
-#include <pjsip_ua.h>
-#include <pjsip_simple.h>
-#include <pjlib-util.h>
-#include <pjlib.h>
-
namespace AsteriskSCF
{
diff --git a/src/SipSessionManagerApp.cpp b/src/SipSessionManagerApp.cpp
index 36bbb3b..a19249d 100644
--- a/src/SipSessionManagerApp.cpp
+++ b/src/SipSessionManagerApp.cpp
@@ -14,6 +14,8 @@
* at the top of the source tree.
*/
+#include <pjlib.h>
+
#include <Ice/Ice.h>
#include <IceStorm/IceStorm.h>
#include <IceBox/IceBox.h>
@@ -21,7 +23,6 @@
#include <boost/thread.hpp>
#include <boost/shared_ptr.hpp>
-#include <pjlib.h>
#include <AsteriskSCF/Core/Routing/RoutingIf.h>
#include <AsteriskSCF/Core/Discovery/ServiceLocatorIf.h>
diff --git a/src/SipSessionManagerEndpointLocator.cpp b/src/SipSessionManagerEndpointLocator.cpp
index ff2439c..71e5135 100644
--- a/src/SipSessionManagerEndpointLocator.cpp
+++ b/src/SipSessionManagerEndpointLocator.cpp
@@ -14,13 +14,13 @@
* at the top of the source tree.
*/
-#include <boost/thread.hpp>
-#include <boost/shared_ptr.hpp>
-
#include "SipEndpointFactory.h"
#include "SipSessionManagerEndpointLocator.h"
#include "SipEndpoint.h"
+#include <boost/thread.hpp>
+#include <boost/shared_ptr.hpp>
+
namespace AsteriskSCF
{
namespace SipSessionManager
diff --git a/src/SipSessionManagerEndpointLocator.h b/src/SipSessionManagerEndpointLocator.h
index c942e74..57c8032 100644
--- a/src/SipSessionManagerEndpointLocator.h
+++ b/src/SipSessionManagerEndpointLocator.h
@@ -16,10 +16,10 @@
#pragma once
-#include <AsteriskSCF/Core/Routing/RoutingIf.h>
-
#include "SipEndpointFactory.h"
+#include <AsteriskSCF/Core/Routing/RoutingIf.h>
+
namespace AsteriskSCF
{
namespace SipSessionManager
diff --git a/src/SipSessionManagerEventPublisher.cpp b/src/SipSessionManagerEventPublisher.cpp
index 794eb5b..a716072 100644
--- a/src/SipSessionManagerEventPublisher.cpp
+++ b/src/SipSessionManagerEventPublisher.cpp
@@ -14,13 +14,13 @@
* at the top of the source tree.
*/
+#include "SipSessionManagerEventPublisher.h"
+
#include <Ice/Ice.h>
#include <IceStorm/IceStorm.h>
#include <AsteriskSCF/logger.h>
-#include "SipSessionManagerEventPublisher.h"
-
using namespace ::std;
using namespace ::AsteriskSCF::SIP::V1;
using namespace AsteriskSCF::System::Logging;
diff --git a/src/SipStateReplicator.h b/src/SipStateReplicator.h
index 0c60762..02fde05 100644
--- a/src/SipStateReplicator.h
+++ b/src/SipStateReplicator.h
@@ -16,11 +16,11 @@
#pragma once
+#include "SipEndpointFactory.h"
#include <Ice/Ice.h>
-
#include <AsteriskSCF/Replication/StateReplicator.h>
#include <SipStateReplicationIf.h>
-#include "SipEndpointFactory.h"
+
#include <boost/shared_ptr.hpp>
namespace AsteriskSCF
diff --git a/src/SipStateReplicatorApp.cpp b/src/SipStateReplicatorApp.cpp
index 765b658..c6cb96a 100644
--- a/src/SipStateReplicatorApp.cpp
+++ b/src/SipStateReplicatorApp.cpp
@@ -14,6 +14,8 @@
* at the top of the source tree.
*/
+#include "SipStateReplicator.h"
+
#include <Ice/Ice.h>
#include <IceUtil/UUID.h>
#include <IceStorm/IceStorm.h>
@@ -25,7 +27,6 @@
#include <AsteriskSCF/Logger/IceLogger.h>
#include <SipIf.h>
-#include "SipStateReplicator.h"
using namespace std;
using namespace AsteriskSCF::Core;
diff --git a/src/SipStateReplicatorListener.cpp b/src/SipStateReplicatorListener.cpp
index 3bf3ce8..5cb7bb5 100644
--- a/src/SipStateReplicatorListener.cpp
+++ b/src/SipStateReplicatorListener.cpp
@@ -14,17 +14,17 @@
* at the top of the source tree.
*/
-#include <IceUtil/UUID.h>
-
-#include <boost/thread.hpp>
-#include <boost/shared_ptr.hpp>
-
#include "SipStateReplicator.h"
#include "SipEndpoint.h"
#include "SipEndpointFactory.h"
#include "SipSession.h"
#include "PJSipManager.h"
+#include <IceUtil/UUID.h>
+
+#include <boost/thread.hpp>
+#include <boost/shared_ptr.hpp>
+
namespace AsteriskSCF
{
namespace SipSessionManager
-----------------------------------------------------------------------
--
asterisk-scf/integration/sip.git
More information about the asterisk-scf-commits
mailing list