[asterisk-scf-commits] asterisk-scf/integration/test_channel.git branch "master" updated.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Mon Nov 15 14:10:56 CST 2010
branch "master" has been updated
via 93501e90428b9c45b02316d13eee8b087c4fea6c (commit)
from 1c37794f2e602a951d0ef2d797f96638c99cd6f1 (commit)
Summary of changes:
src/ConsoleDriver.h | 2 +-
src/InternalExceptions.h | 50 ++++++------
src/ListenerManager.h | 210 +++++++++++++++++++++++-----------------------
src/Logger.h | 84 +++++++++---------
src/MediaEchoThread.h | 14 ++--
src/MediaSession.cpp | 4 +-
src/MediaSession.h | 14 ++--
src/Service.cpp | 12 ++--
src/TestEndpoint.cpp | 52 ++++++------
src/TestEndpoint.h | 22 +++---
src/main.cpp | 6 +-
11 files changed, 235 insertions(+), 235 deletions(-)
- Log -----------------------------------------------------------------
commit 93501e90428b9c45b02316d13eee8b087c4fea6c
Author: David M. Lee <dlee at digium.com>
Date: Mon Nov 15 14:03:39 2010 -0600
Updated indentation to match the style guide.
diff --git a/src/ConsoleDriver.h b/src/ConsoleDriver.h
index 605e876..ed267e6 100644
--- a/src/ConsoleDriver.h
+++ b/src/ConsoleDriver.h
@@ -28,7 +28,7 @@ class ConsoleDriver : virtual public IceUtil::Thread
{
public:
ConsoleDriver();
-
+
void run();
void setHandler(const AsteriskSCF::TestChannel::V1::CommandsPrx& handler);
void write(const std::string& msg);
diff --git a/src/InternalExceptions.h b/src/InternalExceptions.h
index 9f43732..c5e104b 100644
--- a/src/InternalExceptions.h
+++ b/src/InternalExceptions.h
@@ -17,37 +17,37 @@ namespace AsteriskSCF
{
namespace TestUtil
{
- class ConfigException : public std::exception
- {
- public:
+class ConfigException : public std::exception
+{
+public:
- ConfigException(const std::string& propertyName, const std::string& message)
+ ConfigException(const std::string& propertyName, const std::string& message)
+ {
+ std::stringstream msg;
+ msg << propertyName << " configuration error: ";
+ if(message.size() != 0)
{
- std::stringstream msg;
- msg << propertyName << " configuration error: ";
- if(message.size() != 0)
- {
- msg << message;
- }
- else
- {
- msg << "(no message)";
- }
- mWhat = msg.str();
+ msg << message;
}
-
- ~ConfigException() throw()
+ else
{
+ msg << "(no message)";
}
+ mWhat = msg.str();
+ }
- const char* what() const
- throw()
- {
- return mWhat.c_str();
- }
+ ~ConfigException() throw()
+ {
+ }
+
+ const char* what() const
+ throw()
+ {
+ return mWhat.c_str();
+ }
- private:
- std::string mWhat;
- };
+private:
+ std::string mWhat;
+};
}
}
diff --git a/src/ListenerManager.h b/src/ListenerManager.h
index 1be7165..17f3932 100644
--- a/src/ListenerManager.h
+++ b/src/ListenerManager.h
@@ -19,140 +19,140 @@ namespace AsteriskSCF
{
namespace TestUtil
{
- //
- // Helper template for classes that need to implement listener style interfaces.
- //
- template <class T>
- class ListenerManagerT : public IceUtil::Shared
+//
+// Helper template for classes that need to implement listener style interfaces.
+//
+template <class T>
+class ListenerManagerT : public IceUtil::Shared
+{
+ typedef std::vector<T> ListenerSeq;
+ typename std::vector<T>::iterator ListenerIter;
+public:
+ ListenerManagerT(const Ice::CommunicatorPtr& communicator, const std::string& topicName) :
+ mCommunicator(communicator),
+ mTopicName(topicName)
{
- typedef std::vector<T> ListenerSeq;
- typename std::vector<T>::iterator ListenerIter;
- public:
- ListenerManagerT(const Ice::CommunicatorPtr& communicator, const std::string& topicName) :
- mCommunicator(communicator),
- mTopicName(topicName)
+ //
+ // TODO: While this is being concocted for a single component, it would make more sense
+ // to have the topic manager passed in during construction for more general usage.
+ //
+ const std::string propertyName = "TopicManager.Proxy";
+ std::string topicManagerProperty = mCommunicator->getProperties()->getProperty(propertyName);
+ if(topicManagerProperty.size() == 0)
{
- //
- // TODO: While this is being concocted for a single component, it would make more sense
- // to have the topic manager passed in during construction for more general usage.
- //
- const std::string propertyName = "TopicManager.Proxy";
- std::string topicManagerProperty = mCommunicator->getProperties()->getProperty(propertyName);
- if(topicManagerProperty.size() == 0)
- {
- throw ConfigException(propertyName, "Topic manager proxy property missing. "
- "Unable to initialize listener support.");
- }
+ throw ConfigException(propertyName, "Topic manager proxy property missing. "
+ "Unable to initialize listener support.");
+ }
- try
- {
- mTopicManager = IceStorm::TopicManagerPrx::checkedCast(mCommunicator->stringToProxy(topicManagerProperty));
- }
- catch(const Ice::Exception&)
- {
- }
- if(!mTopicManager)
- {
- throw ConfigException(propertyName, "Topic manager proxy is not a valid proxy or is unreachable");
- }
+ try
+ {
+ mTopicManager = IceStorm::TopicManagerPrx::checkedCast(mCommunicator->stringToProxy(topicManagerProperty));
+ }
+ catch(const Ice::Exception&)
+ {
+ }
+ if(!mTopicManager)
+ {
+ throw ConfigException(propertyName, "Topic manager proxy is not a valid proxy or is unreachable");
+ }
- try
- {
- mTopic = mTopicManager->retrieve(mTopicName);
- }
- catch(const IceStorm::NoSuchTopic&)
- {
- }
+ try
+ {
+ mTopic = mTopicManager->retrieve(mTopicName);
+ }
+ catch(const IceStorm::NoSuchTopic&)
+ {
+ }
- if(!mTopic)
+ if(!mTopic)
+ {
+ try
{
- try
- {
- mTopic = mTopicManager->create(mTopicName);
- }
- catch(const IceStorm::TopicExists&)
- {
- //
- // In case there is a race condition when creating the topic.
- //
- mTopic = mTopicManager->retrieve(mTopicName);
- }
+ mTopic = mTopicManager->create(mTopicName);
}
-
- if(!mTopic)
+ catch(const IceStorm::TopicExists&)
{
- throw ConfigException(propertyName,
- std::string("unable to create topic with the provided configuration :") + mTopicName);
+ //
+ // In case there is a race condition when creating the topic.
+ //
+ mTopic = mTopicManager->retrieve(mTopicName);
}
}
- virtual ~ListenerManagerT()
+ if(!mTopic)
{
- if(mTopic)
- {
- try
- {
- mTopic->destroy();
- }
- catch(...)
- {
- //
- // Destructors are no-throw!
- //
- }
- }
+ throw ConfigException(propertyName,
+ std::string("unable to create topic with the provided configuration :") + mTopicName);
}
+ }
- //
- // NOTE: The current implementation is a little fast and loose here. Inconsistent conditions
- // and whatnot are not flagged.
- //
- void addListener(const T& listener)
+ virtual ~ListenerManagerT()
+ {
+ if(mTopic)
{
- boost::unique_lock<boost::shared_mutex> lock(mLock);
- if(std::find(mListeners.begin(), mListeners.end(), listener) == mListeners.end())
- {
- mListeners.push_back(listener);
- }
- IceStorm::QoS qos;
- qos["reliability"] = "ordered";
try
{
- mTopic->subscribeAndGetPublisher(qos, listener);
+ mTopic->destroy();
}
- catch(const IceStorm::AlreadySubscribed&)
+ catch(...)
{
//
- // This indicates some kind of inconsistent state.
+ // Destructors are no-throw!
//
}
}
+ }
- void removeListener(const T& listener)
+ //
+ // NOTE: The current implementation is a little fast and loose here. Inconsistent conditions
+ // and whatnot are not flagged.
+ //
+ void addListener(const T& listener)
+ {
+ boost::unique_lock<boost::shared_mutex> lock(mLock);
+ if(std::find(mListeners.begin(), mListeners.end(), listener) == mListeners.end())
{
- boost::unique_lock<boost::shared_mutex> lock(mLock);
- typename std::vector<T>::iterator i = std::find(mListeners.begin(), mListeners.end(), listener);
- if(i != mListeners.end())
- {
- mListeners.erase(i);
- mTopic->unsubscribe(listener);
- }
+ mListeners.push_back(listener);
+ }
+ IceStorm::QoS qos;
+ qos["reliability"] = "ordered";
+ try
+ {
+ mTopic->subscribeAndGetPublisher(qos, listener);
}
+ catch(const IceStorm::AlreadySubscribed&)
+ {
+ //
+ // This indicates some kind of inconsistent state.
+ //
+ }
+ }
- std::vector<T> getListeners()
+ void removeListener(const T& listener)
+ {
+ boost::unique_lock<boost::shared_mutex> lock(mLock);
+ typename std::vector<T>::iterator i = std::find(mListeners.begin(), mListeners.end(), listener);
+ if(i != mListeners.end())
{
- boost::shared_lock<boost::shared_mutex> lock(mLock);
- std::vector<T> result(mListeners);
- return result;
+ mListeners.erase(i);
+ mTopic->unsubscribe(listener);
}
+ }
+
+ std::vector<T> getListeners()
+ {
+ boost::shared_lock<boost::shared_mutex> lock(mLock);
+ std::vector<T> result(mListeners);
+ return result;
+ }
- protected:
- boost::shared_mutex mLock;
- Ice::CommunicatorPtr mCommunicator;
- std::string mTopicName;
- IceStorm::TopicPrx mTopic;
- IceStorm::TopicManagerPrx mTopicManager;
- ListenerSeq mListeners;
- };
+protected:
+ boost::shared_mutex mLock;
+ Ice::CommunicatorPtr mCommunicator;
+ std::string mTopicName;
+ IceStorm::TopicPrx mTopic;
+ IceStorm::TopicManagerPrx mTopicManager;
+ ListenerSeq mListeners;
+};
}
}
diff --git a/src/Logger.h b/src/Logger.h
index f2c11d6..e045b41 100644
--- a/src/Logger.h
+++ b/src/Logger.h
@@ -1,53 +1,53 @@
/*
-* Asterisk Scalable Communications Framework
-*
-* Copyright (C) 2010 -- Digium, Inc.
-*
-* All rights reserved.
-*/
+ * Asterisk Scalable Communications Framework
+ *
+ * Copyright (C) 2010 -- Digium, Inc.
+ *
+ * All rights reserved.
+ */
#pragma once
#include <iostream>
namespace AsteriskSCF
{
-namespace TestUtil
+namespace TestUtil
{
- //
- // Place holder log stream holder.
- //
- class Logger
+//
+// Place holder log stream holder.
+//
+class Logger
+{
+public:
+ Logger() :
+ mTraceDebug(true)
+ {
+ }
+
+ std::ostream& getTraceStream()
{
- public:
- Logger() :
- mTraceDebug(true)
- {
- }
-
- std::ostream& getTraceStream()
- {
- return std::cerr;
- }
-
- std::ostream& getErrorStream()
- {
- return std::cerr;
- }
-
- std::ostream& getDebugStream()
- {
- return std::cerr;
- }
-
- bool debugTracing() { return mTraceDebug; }
-
- std::ostream& getInfoStream()
- {
- return std::cerr;
- }
-
- private:
- bool mTraceDebug;
- };
+ return std::cerr;
+ }
+
+ std::ostream& getErrorStream()
+ {
+ return std::cerr;
+ }
+
+ std::ostream& getDebugStream()
+ {
+ return std::cerr;
+ }
+
+ bool debugTracing() { return mTraceDebug; }
+
+ std::ostream& getInfoStream()
+ {
+ return std::cerr;
+ }
+
+private:
+ bool mTraceDebug;
+};
} // End of namespace TestUtil
} // End of namespace AsteriskSCF
diff --git a/src/MediaEchoThread.h b/src/MediaEchoThread.h
index 7bba4d3..6fc87fb 100644
--- a/src/MediaEchoThread.h
+++ b/src/MediaEchoThread.h
@@ -1,10 +1,10 @@
/*
-* Asterisk Scalable Communications Framework
-*
-* Copyright (C) 2010 -- Digium, Inc.
-*
-* All rights reserved.
-*/
+ * Asterisk Scalable Communications Framework
+ *
+ * Copyright (C) 2010 -- Digium, Inc.
+ *
+ * All rights reserved.
+ */
#pragma once
#include <Ice/Ice.h>
#include <Media/MediaIf.h>
@@ -44,4 +44,4 @@ private:
typedef IceUtil::Handle<MediaEchoThread> MediaEchoThreadPtr;
} /* end of namespace TestUtil */
-} /* end of namespace AsteriskSCF */
+} /* end of namespace AsteriskSCF */
diff --git a/src/MediaSession.cpp b/src/MediaSession.cpp
index d20ca0b..b9e3d3d 100644
--- a/src/MediaSession.cpp
+++ b/src/MediaSession.cpp
@@ -28,11 +28,11 @@ MediaSessionI::MediaSessionI(const std::string& id, const Ice::ObjectAdapterPtr&
{
mSink = new SinkI(mId + "Sink");
mSinks.push_back(AsteriskSCF::Media::V1::StreamSinkPrx::uncheckedCast(mAdapter->add(mSink,
- mAdapter->getCommunicator()->stringToIdentity(mId + "Sink"))));
+ mAdapter->getCommunicator()->stringToIdentity(mId + "Sink"))));
mSource = new SourceI(mId + "Source", mSink);
mSources.push_back(
AsteriskSCF::Media::V1::StreamSourcePrx::uncheckedCast(mAdapter->add(
- mSource, mAdapter->getCommunicator()->stringToIdentity(mId + "Source"))));
+ mSource, mAdapter->getCommunicator()->stringToIdentity(mId + "Source"))));
}
MediaSessionI::~MediaSessionI()
diff --git a/src/MediaSession.h b/src/MediaSession.h
index 191dfa6..c6196e0 100644
--- a/src/MediaSession.h
+++ b/src/MediaSession.h
@@ -1,10 +1,10 @@
/*
-* Asterisk Scalable Communications Framework
-*
-* Copyright (C) 2010 -- Digium, Inc.
-*
-* All rights reserved.
-*/
+ * Asterisk Scalable Communications Framework
+ *
+ * Copyright (C) 2010 -- Digium, Inc.
+ *
+ * All rights reserved.
+ */
#pragma once
#include <Ice/Ice.h>
#include <Media/MediaIf.h>
@@ -161,7 +161,7 @@ public:
void echoOn();
void echoOff();
void echo();
-
+
private:
boost::shared_mutex mMutex;
std::string mId;
diff --git a/src/Service.cpp b/src/Service.cpp
index fac1d68..6212ed9 100644
--- a/src/Service.cpp
+++ b/src/Service.cpp
@@ -21,7 +21,7 @@
#include "Logger.h"
#include "TestEndpoint.h"
-namespace
+namespace
{
class TestChannelDriver : public IceBox::Service
{
@@ -50,7 +50,7 @@ void TestChannelDriver::start(const std::string& name, const Ice::CommunicatorPt
mAdapter->activate();
AsteriskSCF::Core::Routing::V1::EndpointLocatorPtr servant = AsteriskSCF::TestUtil::TestEndpoint::create(mAdapter, "TestChannel.Locator");
- AsteriskSCF::Core::Routing::V1::EndpointLocatorPrx endpointLocatorPrx =
+ AsteriskSCF::Core::Routing::V1::EndpointLocatorPrx endpointLocatorPrx =
AsteriskSCF::Core::Routing::V1::EndpointLocatorPrx::checkedCast(mAdapter->add(servant, communicator->stringToIdentity("TestChannel")));
AsteriskSCF::Core::Discovery::V1::ServiceLocatorManagementPrx management = AsteriskSCF::Core::Discovery::V1::ServiceLocatorManagementPrx::checkedCast(communicator->propertyToProxy("ServiceLocatorManagementProxy"));
@@ -81,8 +81,8 @@ void TestChannelDriver::stop()
}
extern "C" {
- ASTERISK_SCF_ICEBOX_EXPORT ::IceBox::Service* create(Ice::CommunicatorPtr communicator)
- {
- return new TestChannelDriver;
- }
+ASTERISK_SCF_ICEBOX_EXPORT ::IceBox::Service* create(Ice::CommunicatorPtr communicator)
+{
+ return new TestChannelDriver;
+}
}
diff --git a/src/TestEndpoint.cpp b/src/TestEndpoint.cpp
index 9c864b4..630ea70 100644
--- a/src/TestEndpoint.cpp
+++ b/src/TestEndpoint.cpp
@@ -33,7 +33,7 @@
using namespace AsteriskSCF::TestUtil;
-namespace
+namespace
{
//
@@ -110,7 +110,7 @@ public:
{
mSession = prx;
}
-
+
protected:
AsteriskSCF::SessionCommunications::V1::SessionListenerPrx mPublisher;
AsteriskSCF::SessionCommunications::V1::SessionPrx mSession;
@@ -126,7 +126,7 @@ class SessionI : public AsteriskSCF::SessionCommunications::V1::Session
{
public:
SessionI(const InternalManagerPtr& m, const AsteriskSCF::SessionCommunications::V1::SessionEndpointPrx& prx, const std::string& id,
- const Ice::ObjectAdapterPtr& adapter) :
+ const Ice::ObjectAdapterPtr& adapter) :
mEndpointManager(m),
mEndpointPrx(prx),
mId(id),
@@ -138,7 +138,7 @@ public:
AsteriskSCF::SessionCommunications::V1::SessionInfoPtr addListener(
const AsteriskSCF::SessionCommunications::V1::SessionListenerPrx& listener,
- const Ice::Current&)
+ const Ice::Current&)
{
mListeners->addListener(listener);
mEndpointManager->log(mId, __FUNCTION__);
@@ -175,7 +175,7 @@ public:
{
mMediaSession = AsteriskSCF::Media::V1::SessionPrx::uncheckedCast(
current.adapter->add(new MediaSessionI(mId + "Media", current.adapter),
- current.adapter->getCommunicator()->stringToIdentity(mId + "Media")));
+ current.adapter->getCommunicator()->stringToIdentity(mId + "Media")));
}
return mMediaSession;
};
@@ -191,7 +191,7 @@ public:
}
void removeListener(const AsteriskSCF::SessionCommunications::V1::SessionListenerPrx& listener,
- const Ice::Current&)
+ const Ice::Current&)
{
mListeners->removeListener(listener);
mEndpointManager->log(mId, __FUNCTION__);
@@ -201,17 +201,17 @@ public:
{
mEndpointManager->log(mId, __FUNCTION__);
}
-
+
void start(const Ice::Current&)
{
mEndpointManager->log(mId, __FUNCTION__);
}
-
+
void stop(const AsteriskSCF::SessionCommunications::V1::ResponseCodePtr& response, const Ice::Current&)
{
mEndpointManager->log(mId, __FUNCTION__);
}
-
+
void unhold(const Ice::Current&)
{
mEndpointManager->log(mId, __FUNCTION__);
@@ -224,7 +224,7 @@ public:
}
AsteriskSCF::SessionCommunications::V1::SessionInfoPtr setBridge(const AsteriskSCF::SessionCommunications::V1::BridgePrx& newBridge,
- const AsteriskSCF::SessionCommunications::V1::SessionListenerPrx& listener, const Ice::Current&)
+ const AsteriskSCF::SessionCommunications::V1::SessionListenerPrx& listener, const Ice::Current&)
{
boost::unique_lock<boost::shared_mutex> lock(mMutex);
mCurrentBridge = newBridge;
@@ -233,7 +233,7 @@ public:
return mInfo;
}
- void removeBridge(const AsteriskSCF::SessionCommunications::V1::SessionListenerPrx& listener, const Ice::Current&)
+ void removeBridge(const AsteriskSCF::SessionCommunications::V1::SessionListenerPrx& listener, const Ice::Current&)
{
boost::unique_lock<boost::shared_mutex> lock(mMutex);
if(!mCurrentBridge)
@@ -249,7 +249,7 @@ public:
{
mMediaServant->echo();
}
-
+
void echoOn()
{
mMediaServant->echoOn();
@@ -294,9 +294,9 @@ private:
typedef IceUtil::Handle<SessionI> SessionIPtr;
class EndpointManager :
- virtual public IceUtil::Shared,
- virtual public InternalManagerIf,
- virtual public AsteriskSCF::SessionCommunications::V1::SessionEndpoint
+ virtual public IceUtil::Shared,
+ virtual public InternalManagerIf,
+ virtual public AsteriskSCF::SessionCommunications::V1::SessionEndpoint
{
public:
@@ -308,14 +308,14 @@ public:
AsteriskSCF::SessionCommunications::V1::SessionPrx createSession(
const std::string& destination,
- const AsteriskSCF::SessionCommunications::V1::SessionListenerPrx& listener,
- const Ice::Current& current)
+ const AsteriskSCF::SessionCommunications::V1::SessionListenerPrx& listener,
+ const Ice::Current& current)
{
InternalSessionInfo info;
info.id = mId + "." + destination + "." + IceUtil::generateUUID();
info.servant = new SessionI(this,
- AsteriskSCF::SessionCommunications::V1::SessionEndpointPrx::checkedCast(current.adapter->createProxy(current.id)),
- info.id, current.adapter);
+ AsteriskSCF::SessionCommunications::V1::SessionEndpointPrx::checkedCast(current.adapter->createProxy(current.id)),
+ info.id, current.adapter);
info.session = AsteriskSCF::SessionCommunications::V1::SessionPrx::checkedCast(current.adapter->add(info.servant, current.adapter->getCommunicator()->stringToIdentity(info.id)));
info.servant->setProxy(info.session);
boost::unique_lock<boost::shared_mutex> lock(mMutex);
@@ -361,7 +361,7 @@ public:
}
std::cerr << "Unknown id" << std::endl;
}
-
+
void echoOn(const std::string& id)
{
boost::unique_lock<boost::shared_mutex> lock(mMutex);
@@ -397,7 +397,7 @@ public:
}
std::cerr << "Unknown id" << std::endl;
}
-
+
void hangup(const std::string& id)
{
boost::unique_lock<boost::shared_mutex> lock(mMutex);
@@ -421,7 +421,7 @@ public:
}
std::cerr << "Unknown id" << std::endl;
}
-
+
void getlog(const std::string& id, std::vector<std::string>& log)
{
boost::unique_lock<boost::shared_mutex> lock(mMutex);
@@ -476,7 +476,7 @@ public:
{
mMgr->echo(id);
}
-
+
void echoOn(const std::string& id, const Ice::Current&)
{
mMgr->echoOn(id);
@@ -491,7 +491,7 @@ public:
{
mMgr->answer(id);
}
-
+
void hangup(const std::string& id, const Ice::Current&)
{
mMgr->hangup(id);
@@ -501,7 +501,7 @@ public:
{
mMgr->die(id);
}
-
+
void getlog(const std::string& id, std::vector<std::string>& log, const Ice::Current&)
{
mMgr->getlog(id, log);
@@ -556,7 +556,7 @@ typedef IceUtil::Handle<EndpointLocatorI> EndpointLocatorIPtr;
AsteriskSCF::Core::Routing::V1::EndpointLocatorPtr TestEndpoint::create(const Ice::ObjectAdapterPtr& adapter, const std::string& id)
{
-
+
EndpointLocatorIPtr impl(new EndpointLocatorI(adapter, id));
return AsteriskSCF::Core::Routing::V1::EndpointLocatorPtr::dynamicCast(impl);
}
diff --git a/src/TestEndpoint.h b/src/TestEndpoint.h
index c6ece4d..3ff36ab 100644
--- a/src/TestEndpoint.h
+++ b/src/TestEndpoint.h
@@ -24,17 +24,17 @@ namespace AsteriskSCF
{
namespace TestUtil
{
+//
+// For the moment basically a factory that creates
+class TestEndpoint
+{
+ //
+ // TestEndpoint currently doesn't support any instance specific
+ // functionality so creating an instance of it is pointless.
//
- // For the moment basically a factory that creates
- class TestEndpoint
- {
- //
- // TestEndpoint currently doesn't support any instance specific
- // functionality so creating an instance of it is pointless.
- //
- TestEndpoint() {}
- public:
- static AsteriskSCF::Core::Routing::V1::EndpointLocatorPtr create(const Ice::ObjectAdapterPtr& adapter, const std::string& id);
- };
+ TestEndpoint() {}
+public:
+ static AsteriskSCF::Core::Routing::V1::EndpointLocatorPtr create(const Ice::ObjectAdapterPtr& adapter, const std::string& id);
+};
}
} // End of namespace AsteriskSCF
diff --git a/src/main.cpp b/src/main.cpp
index 99fa830..5eaf952 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -18,12 +18,12 @@
#include "ConsoleDriver.h"
#include <iostream>
-namespace
+namespace
{
class ConsoleApp : public Ice::Application
{
public:
- ConsoleApp()
+ ConsoleApp()
{
}
@@ -40,7 +40,7 @@ int ConsoleApp::run(int, char**)
{
callbackOnInterrupt();
- AsteriskSCF::TestChannel::V1::CommandsPrx commandIf =
+ AsteriskSCF::TestChannel::V1::CommandsPrx commandIf =
AsteriskSCF::TestChannel::V1::CommandsPrx::checkedCast(communicator()->propertyToProxy("TestCommands.Proxy"));
if(!commandIf)
{
-----------------------------------------------------------------------
--
asterisk-scf/integration/test_channel.git
More information about the asterisk-scf-commits
mailing list