diff options
Diffstat (limited to 'cpp/src')
138 files changed, 0 insertions, 254 deletions
diff --git a/cpp/src/Glacier2/FilterManager.cpp b/cpp/src/Glacier2/FilterManager.cpp index a577e32ac61..3231ccbcd8a 100644 --- a/cpp/src/Glacier2/FilterManager.cpp +++ b/cpp/src/Glacier2/FilterManager.cpp @@ -15,7 +15,6 @@ #include <Glacier2/FilterManager.h> #include <Glacier2/FilterI.h> - using namespace std; using namespace Ice; diff --git a/cpp/src/Glacier2/Glacier2Router.cpp b/cpp/src/Glacier2/Glacier2Router.cpp index 2f23bd6d21b..98242f8eef0 100644 --- a/cpp/src/Glacier2/Glacier2Router.cpp +++ b/cpp/src/Glacier2/Glacier2Router.cpp @@ -46,7 +46,6 @@ private: SessionRouterIPtr _sessionRouter; }; - class FinderI : public Ice::RouterFinder { public: diff --git a/cpp/src/Glacier2/ProxyVerifier.cpp b/cpp/src/Glacier2/ProxyVerifier.cpp index 1ecdd5c076f..9df5d0be407 100644 --- a/cpp/src/Glacier2/ProxyVerifier.cpp +++ b/cpp/src/Glacier2/ProxyVerifier.cpp @@ -434,7 +434,6 @@ public: } }; - // // AddressMatcher factories abstract away the logic of which matching // objects need to be created depending on the state of the filter diff --git a/cpp/src/Glacier2/RequestQueue.h b/cpp/src/Glacier2/RequestQueue.h index bc7e6f648bd..69c05a1d180 100644 --- a/cpp/src/Glacier2/RequestQueue.h +++ b/cpp/src/Glacier2/RequestQueue.h @@ -96,7 +96,6 @@ private: }; typedef IceUtil::Handle<RequestQueue> RequestQueuePtr; - class RequestQueueThread : public IceUtil::Thread, public IceUtil::Monitor<IceUtil::Mutex> { public: diff --git a/cpp/src/Glacier2/SessionRouterI.cpp b/cpp/src/Glacier2/SessionRouterI.cpp index cd150de5fa2..0172d4ee35f 100644 --- a/cpp/src/Glacier2/SessionRouterI.cpp +++ b/cpp/src/Glacier2/SessionRouterI.cpp @@ -232,7 +232,6 @@ public: { } - void checkPermissionsResponse(bool ok, const string& reason) { diff --git a/cpp/src/Glacier2/SessionRouterI.h b/cpp/src/Glacier2/SessionRouterI.h index 60392fb8de0..98ad5a6a8a1 100644 --- a/cpp/src/Glacier2/SessionRouterI.h +++ b/cpp/src/Glacier2/SessionRouterI.h @@ -21,7 +21,6 @@ #include <set> - namespace Glacier2 { diff --git a/cpp/src/Glacier2CryptPermissionsVerifier/CryptPermissionsVerifierI.cpp b/cpp/src/Glacier2CryptPermissionsVerifier/CryptPermissionsVerifierI.cpp index 68666b9531a..c59b2d386e6 100644 --- a/cpp/src/Glacier2CryptPermissionsVerifier/CryptPermissionsVerifierI.cpp +++ b/cpp/src/Glacier2CryptPermissionsVerifier/CryptPermissionsVerifierI.cpp @@ -136,10 +136,8 @@ private: R _ref; }; - #endif - class CryptPermissionsVerifierI : public PermissionsVerifier { public: @@ -168,7 +166,6 @@ private: CommunicatorPtr _communicator; }; - map<string, string> retrievePasswordMap(const string& file) { @@ -508,7 +505,6 @@ CryptPermissionsVerifierI::checkPermissions(const string& userId, const string& #endif } - CryptPermissionsVerifierPlugin::CryptPermissionsVerifierPlugin(const CommunicatorPtr& communicator) : _communicator(communicator) { diff --git a/cpp/src/Glacier2Lib/Application.cpp b/cpp/src/Glacier2Lib/Application.cpp index 43b0d091efe..817502df9da 100644 --- a/cpp/src/Glacier2Lib/Application.cpp +++ b/cpp/src/Glacier2Lib/Application.cpp @@ -106,7 +106,6 @@ Glacier2::Application::restart() throw RestartSessionException(); } - Glacier2::RouterPrxPtr Glacier2::Application::router() { diff --git a/cpp/src/Glacier2Lib/SessionHelper.cpp b/cpp/src/Glacier2Lib/SessionHelper.cpp index 4b781be2ea1..be80106633f 100644 --- a/cpp/src/Glacier2Lib/SessionHelper.cpp +++ b/cpp/src/Glacier2Lib/SessionHelper.cpp @@ -73,7 +73,6 @@ public: { } - virtual void run() { @@ -303,13 +302,11 @@ SessionHelperI::objectAdapter() return internalObjectAdapter(); } - Glacier2::SessionHelper::~SessionHelper() { // Out of line to avoid weak vtable } - #ifndef ICE_CPP11_MAPPING bool Glacier2::SessionHelper::operator==(const Glacier2::SessionHelper& other) const @@ -344,7 +341,6 @@ Glacier2::SessionCallback::~SessionCallback() // Out of line to avoid weak vtable } - namespace { @@ -621,7 +617,6 @@ private: const string _finder; }; - class DispatchCallThread : public IceUtil::Thread { diff --git a/cpp/src/Ice/ACM.cpp b/cpp/src/Ice/ACM.cpp index 6cdec20d8f7..238791edfa1 100644 --- a/cpp/src/Ice/ACM.cpp +++ b/cpp/src/Ice/ACM.cpp @@ -210,7 +210,6 @@ IceInternal::FactoryACMMonitor::runTimerTask() } } - // // Monitor connections outside the thread synchronization, so // that connections can be added or removed during monitoring. diff --git a/cpp/src/Ice/Acceptor.cpp b/cpp/src/Ice/Acceptor.cpp index a48d1f72907..35c48e70d4d 100644 --- a/cpp/src/Ice/Acceptor.cpp +++ b/cpp/src/Ice/Acceptor.cpp @@ -13,11 +13,9 @@ using namespace std; using namespace Ice; using namespace IceInternal; - Acceptor::~Acceptor() { // Out of line to avoid weak vtable } - IceUtil::Shared* IceInternal::upCast(Acceptor* p) { return p; } diff --git a/cpp/src/Ice/ConnectRequestHandler.cpp b/cpp/src/Ice/ConnectRequestHandler.cpp index 47c26f53da2..b201a5c1c30 100644 --- a/cpp/src/Ice/ConnectRequestHandler.cpp +++ b/cpp/src/Ice/ConnectRequestHandler.cpp @@ -192,7 +192,6 @@ ConnectRequestHandler::setException(const Ice::LocalException& ex) // Ignore } - for(deque<ProxyOutgoingAsyncBasePtr>::const_iterator p = _requests.begin(); p != _requests.end(); ++p) { if((*p)->exception(ex)) diff --git a/cpp/src/Ice/ConnectionI.cpp b/cpp/src/Ice/ConnectionI.cpp index 2eb66ff7d0a..e65b877e718 100644 --- a/cpp/src/Ice/ConnectionI.cpp +++ b/cpp/src/Ice/ConnectionI.cpp @@ -294,7 +294,6 @@ Ice::ConnectionI::Observer::attach(const Ice::Instrumentation::ConnectionObserve } } - void Ice::ConnectionI::OutgoingMessage::adopt(OutputStream* str) { @@ -2083,7 +2082,6 @@ Ice::ConnectionI::finish(bool close) #endif } - for(deque<OutgoingMessage>::iterator o = _sendStreams.begin(); o != _sendStreams.end(); ++o) { o->completed(*_exception); diff --git a/cpp/src/Ice/ConnectionI.h b/cpp/src/Ice/ConnectionI.h index 928cc298d00..19235b4e71a 100644 --- a/cpp/src/Ice/ConnectionI.h +++ b/cpp/src/Ice/ConnectionI.h @@ -126,7 +126,6 @@ public: #endif }; - #ifdef ICE_CPP11_MAPPING class StartCallback { @@ -175,7 +174,6 @@ public: IceInternal::BatchRequestQueuePtr getBatchRequestQueue() const; - #ifdef ICE_CPP11_MAPPING virtual std::function<void()> flushBatchRequestsAsync(CompressBatch, diff --git a/cpp/src/Ice/EndpointI.cpp b/cpp/src/Ice/EndpointI.cpp index c1fa1a620b0..7fa0d7ae420 100644 --- a/cpp/src/Ice/EndpointI.cpp +++ b/cpp/src/Ice/EndpointI.cpp @@ -17,7 +17,6 @@ IceUtil::Shared* IceInternal::upCast(EndpointI* p) { return p; } IceUtil::Shared* IceInternal::upCast(EndpointI_connectors* p) { return p; } #endif - IceInternal::EndpointI_connectors::~EndpointI_connectors() { // Out of line to avoid weak vtable diff --git a/cpp/src/Ice/EndpointI.h b/cpp/src/Ice/EndpointI.h index 8ff79a80b3a..9fd977a1be9 100644 --- a/cpp/src/Ice/EndpointI.h +++ b/cpp/src/Ice/EndpointI.h @@ -218,7 +218,6 @@ private: const EndpointIPtr _endpoint; }; - } #endif diff --git a/cpp/src/Ice/Exception.cpp b/cpp/src/Ice/Exception.cpp index 9533739fdde..9faa0bddc71 100644 --- a/cpp/src/Ice/Exception.cpp +++ b/cpp/src/Ice/Exception.cpp @@ -350,7 +350,6 @@ Ice::IllegalServantException::ice_print(ostream& out) const out << ":\nillegal servant: `" << reason << "'"; } - static void printFailedRequestData(ostream& out, const RequestFailedException& ex) { @@ -476,7 +475,6 @@ Ice::OperationInterruptedException::ice_print(ostream& out) const out << ":\noperation interrupted"; } - void Ice::TimeoutException::ice_print(ostream& out) const { diff --git a/cpp/src/Ice/FactoryTableInit.cpp b/cpp/src/Ice/FactoryTableInit.cpp index cdc0cdfda54..2f3b286974a 100644 --- a/cpp/src/Ice/FactoryTableInit.cpp +++ b/cpp/src/Ice/FactoryTableInit.cpp @@ -80,7 +80,6 @@ IceInternal::FactoryTableInit::~FactoryTableInit() } } - IceInternal::CompactIdInit::CompactIdInit(const char* typeId, int compactId) : _compactId(compactId) { diff --git a/cpp/src/Ice/IPEndpointI.cpp b/cpp/src/Ice/IPEndpointI.cpp index 476fc3b809c..26d710898f0 100644 --- a/cpp/src/Ice/IPEndpointI.cpp +++ b/cpp/src/Ice/IPEndpointI.cpp @@ -86,7 +86,6 @@ IceInternal::IPEndpointI::getInfo() const return info; } - Ice::Short IceInternal::IPEndpointI::type() const { @@ -743,7 +742,6 @@ IceInternal::EndpointHostResolver::EndpointHostResolver(const InstancePtr& insta { } - void IceInternal::EndpointHostResolver::resolve(const string& host, int port, diff --git a/cpp/src/Ice/ImplicitContextI.cpp b/cpp/src/Ice/ImplicitContextI.cpp index cc9d9c59b34..2135237dcd9 100644 --- a/cpp/src/Ice/ImplicitContextI.cpp +++ b/cpp/src/Ice/ImplicitContextI.cpp @@ -70,7 +70,6 @@ public: long owner; }; - // // Each thread maintains a SlotVector. Each PerThreadImplicitContext instance // is assigned a slot in this vector. @@ -105,8 +104,6 @@ private: extern "C" void iceImplicitContextThreadDestructor(void*); - - ImplicitContextIPtr ImplicitContextI::create(const std::string& kind) { @@ -148,7 +145,6 @@ ImplicitContextI::cleanupThread() } #endif - // // SharedImplicitContext implementation // @@ -187,7 +183,6 @@ SharedImplicitContext::get(const string& k) const return p->second; } - string SharedImplicitContext::put(const string& k, const string& v) { @@ -479,7 +474,6 @@ PerThreadImplicitContext::clearThreadContext() const } } - Context PerThreadImplicitContext::getContext() const { diff --git a/cpp/src/Ice/Incoming.cpp b/cpp/src/Ice/Incoming.cpp index 8a9416751f5..de99aebb010 100644 --- a/cpp/src/Ice/Incoming.cpp +++ b/cpp/src/Ice/Incoming.cpp @@ -558,7 +558,6 @@ IceInternal::IncomingBase::handleException(const string& msg, bool amd) _responseHandler = 0; } - IceInternal::Incoming::Incoming(Instance* instance, ResponseHandler* responseHandler, Ice::Connection* connection, const ObjectAdapterPtr& adapter, bool response, Byte compress, Int requestId) : IncomingBase(instance, responseHandler, connection, adapter, response, compress, requestId), diff --git a/cpp/src/Ice/Initialize.cpp b/cpp/src/Ice/Initialize.cpp index 65550223b42..cc1997f2c65 100644 --- a/cpp/src/Ice/Initialize.cpp +++ b/cpp/src/Ice/Initialize.cpp @@ -393,7 +393,6 @@ Ice::registerPluginFactory(const std::string& name, PluginFactory factory, bool PluginManagerI::registerPluginFactory(name, factory, loadOnInitialize); } - // // CommunicatorHolder // diff --git a/cpp/src/Ice/InputStream.cpp b/cpp/src/Ice/InputStream.cpp index 0dc57a742ac..e61350d19d7 100644 --- a/cpp/src/Ice/InputStream.cpp +++ b/cpp/src/Ice/InputStream.cpp @@ -36,7 +36,6 @@ using namespace std; using namespace Ice; using namespace IceInternal; - Ice::InputStream::InputStream() { initialize(currentEncoding); @@ -1060,7 +1059,6 @@ Ice::InputStream::read(vector<Double>& v) } } - #ifdef ICE_CPP11_MAPPING void Ice::InputStream::read(pair<const Double*, const Double*>& v) diff --git a/cpp/src/Ice/Instance.cpp b/cpp/src/Ice/Instance.cpp index da0758bb4c4..87d15201c98 100644 --- a/cpp/src/Ice/Instance.cpp +++ b/cpp/src/Ice/Instance.cpp @@ -188,7 +188,6 @@ private: const InstancePtr _instance; }; - // // Timer specialization which supports the thread observer // @@ -1103,7 +1102,6 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, const Initi } } - if(!_initData.logger) { string logfile = _initData.properties->getProperty("Ice.LogFile"); @@ -1223,7 +1221,6 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, const Initi throw InitializationException(__FILE__, __LINE__, "The value for Ice.ToStringMode must be Unicode, ASCII or Compat"); } - // // Client ACM enabled by default. Server ACM disabled by default. // @@ -1790,7 +1787,6 @@ IceInternal::Instance::updateThreadObservers() } } - BufSizeWarnInfo IceInternal::Instance::getBufSizeWarn(Short type) { diff --git a/cpp/src/Ice/InstrumentationI.cpp b/cpp/src/Ice/InstrumentationI.cpp index 27fe4c71b5f..7751721ba2b 100644 --- a/cpp/src/Ice/InstrumentationI.cpp +++ b/cpp/src/Ice/InstrumentationI.cpp @@ -468,7 +468,6 @@ public: return _proxy; } - string getIdentity() const { diff --git a/cpp/src/Ice/LocatorInfo.cpp b/cpp/src/Ice/LocatorInfo.cpp index 9c95d223bf0..95695c88e39 100644 --- a/cpp/src/Ice/LocatorInfo.cpp +++ b/cpp/src/Ice/LocatorInfo.cpp @@ -546,7 +546,6 @@ IceInternal::LocatorInfo::getLocatorRegistry() } } - void IceInternal::LocatorInfo::getEndpoints(const ReferencePtr& ref, const ReferencePtr& wellKnownRef, diff --git a/cpp/src/Ice/LoggerAdminI.cpp b/cpp/src/Ice/LoggerAdminI.cpp index 99a8bae1425..01b9994d560 100644 --- a/cpp/src/Ice/LoggerAdminI.cpp +++ b/cpp/src/Ice/LoggerAdminI.cpp @@ -124,7 +124,6 @@ private: }; ICE_DEFINE_PTR(LoggerAdminIPtr, LoggerAdminI); - class Job : public IceUtil::Shared { public: @@ -140,7 +139,6 @@ public: }; typedef IceUtil::Handle<Job> JobPtr; - class LoggerAdminLoggerI : public IceInternal::LoggerAdminLogger #ifdef ICE_CPP11_MAPPING , public std::enable_shared_from_this<LoggerAdminLoggerI> @@ -187,7 +185,6 @@ private: }; ICE_DEFINE_PTR(LoggerAdminLoggerIPtr, LoggerAdminLoggerI); - class SendLogThread : public IceUtil::Thread { public: @@ -201,7 +198,6 @@ private: LoggerAdminLoggerIPtr _logger; }; - // // Helper functions // diff --git a/cpp/src/Ice/LoggerUtil.cpp b/cpp/src/Ice/LoggerUtil.cpp index 67ff1d3239a..60dc66d4d76 100644 --- a/cpp/src/Ice/LoggerUtil.cpp +++ b/cpp/src/Ice/LoggerUtil.cpp @@ -56,7 +56,6 @@ Ice::loggerInsert(Ice::LoggerOutputBase& out, const IceUtil::Exception& ex) return out; } - Ice::Trace::Trace(const LoggerPtr& logger, const string& category) : _logger(logger), _category(category) @@ -79,7 +78,6 @@ Ice::Trace::flush() _stream().str(""); } - Ice::LoggerPlugin::LoggerPlugin(const CommunicatorPtr& communicator, const LoggerPtr& logger) { if(communicator == 0) diff --git a/cpp/src/Ice/Network.cpp b/cpp/src/Ice/Network.cpp index c761d65dfe0..a4b6cc10c28 100755 --- a/cpp/src/Ice/Network.cpp +++ b/cpp/src/Ice/Network.cpp @@ -72,7 +72,6 @@ extern "C" } #endif - using namespace std; using namespace Ice; using namespace IceInternal; @@ -2246,7 +2245,6 @@ IceInternal::setReuseAddress(SOCKET fd, bool reuse) } #endif - #ifdef ICE_OS_UWP namespace { @@ -2747,7 +2745,6 @@ repeatAccept: return ret; } - void IceInternal::createPipe(SOCKET fds[2]) { @@ -3081,7 +3078,6 @@ IceInternal::doFinishConnectAsync(SOCKET fd, AsyncInfo& info) } #endif - bool IceInternal::isIpAddress(const string& name) { diff --git a/cpp/src/Ice/Network.h b/cpp/src/Ice/Network.h index dfb66aab954..43bd4c0fcaa 100755 --- a/cpp/src/Ice/Network.h +++ b/cpp/src/Ice/Network.h @@ -193,7 +193,6 @@ public: virtual ~ReadyCallback(); - virtual void ready(SocketOperation, bool) = 0; }; typedef IceUtil::Handle<ReadyCallback> ReadyCallbackPtr; diff --git a/cpp/src/Ice/Object.cpp b/cpp/src/Ice/Object.cpp index f69ffc497a3..a0fb5b5c9da 100644 --- a/cpp/src/Ice/Object.cpp +++ b/cpp/src/Ice/Object.cpp @@ -171,7 +171,6 @@ Ice::Object::_iceD_ice_id(Incoming& inS, const Current& current) return true; } - bool #ifdef ICE_CPP11_MAPPING Ice::Object::ice_dispatch(Request& request, std::function<bool()> r, std::function<bool(std::exception_ptr)> e) diff --git a/cpp/src/Ice/ObjectAdapterI.h b/cpp/src/Ice/ObjectAdapterI.h index bad7a896c87..00e70b1ccb8 100644 --- a/cpp/src/Ice/ObjectAdapterI.h +++ b/cpp/src/Ice/ObjectAdapterI.h @@ -74,7 +74,6 @@ public: virtual ObjectPtr findByProxy(const ObjectPrxPtr&) const; virtual ObjectPtr findDefaultServant(const std::string&) const; - virtual void addServantLocator(const ServantLocatorPtr&, const std::string&); virtual ServantLocatorPtr removeServantLocator(const std::string&); virtual ServantLocatorPtr findServantLocator(const std::string&) const; diff --git a/cpp/src/Ice/OpaqueEndpointI.cpp b/cpp/src/Ice/OpaqueEndpointI.cpp index 065af32eae9..df53a9216cb 100644 --- a/cpp/src/Ice/OpaqueEndpointI.cpp +++ b/cpp/src/Ice/OpaqueEndpointI.cpp @@ -211,7 +211,6 @@ IceInternal::OpaqueEndpointI::equivalent(const EndpointIPtr&) const return false; } - Int IceInternal::OpaqueEndpointI::hash() const { diff --git a/cpp/src/Ice/OutgoingAsync.cpp b/cpp/src/Ice/OutgoingAsync.cpp index 60d4cc04983..0c312b4c6f3 100644 --- a/cpp/src/Ice/OutgoingAsync.cpp +++ b/cpp/src/Ice/OutgoingAsync.cpp @@ -1323,5 +1323,4 @@ GenericCallbackBase::~GenericCallbackBase() // Out of line to avoid weak vtable } - #endif diff --git a/cpp/src/Ice/PluginManagerI.h b/cpp/src/Ice/PluginManagerI.h index 1386f3e653a..e7da4de1513 100644 --- a/cpp/src/Ice/PluginManagerI.h +++ b/cpp/src/Ice/PluginManagerI.h @@ -63,5 +63,4 @@ typedef IceUtil::Handle<PluginManagerI> PluginManagerIPtr; } - #endif diff --git a/cpp/src/Ice/PropertiesI.cpp b/cpp/src/Ice/PropertiesI.cpp index 39445713307..12b337f0987 100644 --- a/cpp/src/Ice/PropertiesI.cpp +++ b/cpp/src/Ice/PropertiesI.cpp @@ -118,7 +118,6 @@ Ice::PropertiesI::getPropertyAsListWithDefault(const string& key, const StringSe } } - PropertyDict Ice::PropertiesI::getPropertiesForPrefix(const string& prefix) { diff --git a/cpp/src/Ice/PropertyNames.cpp b/cpp/src/Ice/PropertyNames.cpp index adfc4c3802e..910a0cc2ace 100644 --- a/cpp/src/Ice/PropertyNames.cpp +++ b/cpp/src/Ice/PropertyNames.cpp @@ -1345,7 +1345,6 @@ const IceInternal::PropertyArray IceInternal::PropertyNames::FreezeProps(FreezePropsData, sizeof(FreezePropsData)/sizeof(FreezePropsData[0])); - const IceInternal::PropertyArray IceInternal::PropertyNames::validProps[] = { IceProps, @@ -1368,7 +1367,6 @@ const IceInternal::PropertyArray IceInternal::PropertyNames::validProps[] = IceInternal::PropertyArray(0,0) }; - const char* IceInternal::PropertyNames::clPropNames[] = { "Ice", diff --git a/cpp/src/Ice/Proxy.cpp b/cpp/src/Ice/Proxy.cpp index f5d6551edf1..ea668c25017 100644 --- a/cpp/src/Ice/Proxy.cpp +++ b/cpp/src/Ice/Proxy.cpp @@ -243,7 +243,6 @@ Ice::ObjectPrx::_checkTwowayOnly(const string& name) const } } - shared_ptr<ObjectPrx> Ice::ObjectPrx::_newInstance() const { diff --git a/cpp/src/Ice/Reference.cpp b/cpp/src/Ice/Reference.cpp index f2fe254204a..baf9f9eb719 100644 --- a/cpp/src/Ice/Reference.cpp +++ b/cpp/src/Ice/Reference.cpp @@ -1635,7 +1635,6 @@ IceInternal::RoutableReference::getConnectionNoRouterInfo(const GetConnectionCal const bool _cached; }; - virtual void setEndpoints(const vector<EndpointIPtr>& endpoints, bool cached) { diff --git a/cpp/src/Ice/Reference.h b/cpp/src/Ice/Reference.h index 4ed7f13837f..3addd9a29f0 100644 --- a/cpp/src/Ice/Reference.h +++ b/cpp/src/Ice/Reference.h @@ -75,7 +75,6 @@ public: Ice::CommunicatorPtr getCommunicator() const; - virtual std::vector<EndpointIPtr> getEndpoints() const = 0; virtual std::string getAdapterId() const = 0; virtual LocatorInfoPtr getLocatorInfo() const { return 0; } diff --git a/cpp/src/Ice/RequestHandler.cpp b/cpp/src/Ice/RequestHandler.cpp index 0994a63b2e3..818c7d10ab1 100644 --- a/cpp/src/Ice/RequestHandler.cpp +++ b/cpp/src/Ice/RequestHandler.cpp @@ -18,7 +18,6 @@ IceUtil::Shared* IceInternal::upCast(RequestHandler* p) { return p; } IceUtil::Shared* IceInternal::upCast(CancellationHandler* p) { return p; } #endif - RetryException::RetryException(const Ice::LocalException& ex) { ICE_SET_EXCEPTION_FROM_CLONE(_ex, ex.ice_clone()); diff --git a/cpp/src/Ice/RequestHandler.h b/cpp/src/Ice/RequestHandler.h index 50920dcb0d0..a6eeb211352 100644 --- a/cpp/src/Ice/RequestHandler.h +++ b/cpp/src/Ice/RequestHandler.h @@ -47,7 +47,6 @@ private: IceInternal::UniquePtr<Ice::LocalException> _ex; }; - class CancellationHandler #ifndef ICE_CPP11_MAPPING : public virtual IceUtil::Shared diff --git a/cpp/src/Ice/RetryQueue.h b/cpp/src/Ice/RetryQueue.h index 21a4111b37f..f7aef04bab7 100644 --- a/cpp/src/Ice/RetryQueue.h +++ b/cpp/src/Ice/RetryQueue.h @@ -39,7 +39,6 @@ public: bool operator<(const RetryTask&) const; - private: const InstancePtr _instance; diff --git a/cpp/src/Ice/RouterInfo.cpp b/cpp/src/Ice/RouterInfo.cpp index edee8ca9026..2487b6528e0 100644 --- a/cpp/src/Ice/RouterInfo.cpp +++ b/cpp/src/Ice/RouterInfo.cpp @@ -255,7 +255,6 @@ IceInternal::RouterInfo::addProxy(const Ice::ObjectPrxPtr& proxy, const AddProxy } } - Ice::ObjectProxySeq proxies; proxies.push_back(proxy); AddProxyCookiePtr cookie = new AddProxyCookie(callback, proxy); @@ -343,7 +342,6 @@ IceInternal::RouterInfo::setClientEndpoints(const Ice::ObjectPrxPtr& proxy, bool return _clientEndpoints; } - vector<EndpointIPtr> IceInternal::RouterInfo::setServerEndpoints(const Ice::ObjectPrxPtr& /*serverProxy*/) { diff --git a/cpp/src/Ice/Selector.h b/cpp/src/Ice/Selector.h index 674151a6683..17a5986afcf 100644 --- a/cpp/src/Ice/Selector.h +++ b/cpp/src/Ice/Selector.h @@ -58,7 +58,6 @@ class SelectorTimeoutException { }; - #if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP) class Selector diff --git a/cpp/src/Ice/SlicedData.cpp b/cpp/src/Ice/SlicedData.cpp index e85c3f35492..99871f5bafa 100644 --- a/cpp/src/Ice/SlicedData.cpp +++ b/cpp/src/Ice/SlicedData.cpp @@ -30,7 +30,6 @@ Ice::SlicedData::SlicedData(const SliceInfoSeq& seq) : { } - #ifndef ICE_CPP11_MAPPING void Ice::SlicedData::_iceGcVisitMembers(IceInternal::GCVisitor& visitor) diff --git a/cpp/src/Ice/Thread.cpp b/cpp/src/Ice/Thread.cpp index 1c6cc22dd50..6f32aacfe6b 100644 --- a/cpp/src/Ice/Thread.cpp +++ b/cpp/src/Ice/Thread.cpp @@ -663,7 +663,6 @@ startHook(void* arg) } } - IceUtil::ThreadControl IceUtil::Thread::start(size_t stackSize) { diff --git a/cpp/src/Ice/ThreadPool.h b/cpp/src/Ice/ThreadPool.h index d1d6ba8e82c..93867c7c96c 100644 --- a/cpp/src/Ice/ThreadPool.h +++ b/cpp/src/Ice/ThreadPool.h @@ -391,5 +391,4 @@ private: }; - #endif diff --git a/cpp/src/Ice/UdpTransceiver.cpp b/cpp/src/Ice/UdpTransceiver.cpp index 98bd764814d..32a3f67b5b9 100755 --- a/cpp/src/Ice/UdpTransceiver.cpp +++ b/cpp/src/Ice/UdpTransceiver.cpp @@ -980,7 +980,6 @@ IceInternal::UdpTransceiver::UdpTransceiver(const ProtocolInstancePtr& instance, }); #endif - #ifdef ICE_USE_IOCP // // On Windows when using IOCP, we must make sure that the socket is connected without diff --git a/cpp/src/Ice/WSConnector.h b/cpp/src/Ice/WSConnector.h index 49552be1c34..c0fd21cad66 100644 --- a/cpp/src/Ice/WSConnector.h +++ b/cpp/src/Ice/WSConnector.h @@ -32,7 +32,6 @@ public: virtual bool operator==(const Connector&) const; virtual bool operator<(const Connector&) const; - WSConnector(const ProtocolInstancePtr&, const ConnectorPtr&, const std::string&, const std::string&); virtual ~WSConnector(); diff --git a/cpp/src/Ice/ios/Notifications.mm b/cpp/src/Ice/ios/Notifications.mm index 8fc1c0ae7f1..f536a13db6b 100644 --- a/cpp/src/Ice/ios/Notifications.mm +++ b/cpp/src/Ice/ios/Notifications.mm @@ -118,7 +118,6 @@ private: set<IncomingConnectionFactoryPtr> _factories; }; - } static Observer* observer = new Observer(); diff --git a/cpp/src/IceDB/IceDB.cpp b/cpp/src/IceDB/IceDB.cpp index 1f7373d94ea..8eccf18b41d 100644 --- a/cpp/src/IceDB/IceDB.cpp +++ b/cpp/src/IceDB/IceDB.cpp @@ -144,7 +144,6 @@ BadEnvException::ice_throw() const throw *this; } - Env::Env(const string& path, MDB_dbi maxDbs, size_t mapSize, unsigned int maxReaders) { int rc = mdb_env_create(&_menv); @@ -486,7 +485,6 @@ CursorBase::renew(const ReadOnlyTxn& txn) } } - // // On Windows, we use a default LMDB map size of 10MB, whereas on other platforms // (Linux, macOS), we use a default of 100MB. diff --git a/cpp/src/IceDB/IceDB.h b/cpp/src/IceDB/IceDB.h index dacf58b72a2..9f807a37f78 100644 --- a/cpp/src/IceDB/IceDB.h +++ b/cpp/src/IceDB/IceDB.h @@ -124,7 +124,6 @@ private: static const char* _name; }; - // // Codec reads and writes T to/from MDB_val // @@ -494,7 +493,6 @@ public: } }; - // // Partial specialization of Codec for Ice encoding // diff --git a/cpp/src/IceDiscovery/LocatorI.cpp b/cpp/src/IceDiscovery/LocatorI.cpp index 99e1cdc4fa6..1e0291d0094 100644 --- a/cpp/src/IceDiscovery/LocatorI.cpp +++ b/cpp/src/IceDiscovery/LocatorI.cpp @@ -25,7 +25,6 @@ LocatorRegistryI::LocatorRegistryI(const Ice::CommunicatorPtr& com) : { } - #ifdef ICE_CPP11_MAPPING void LocatorRegistryI::setAdapterDirectProxyAsync(string adapterId, diff --git a/cpp/src/IceGrid/Activator.cpp b/cpp/src/IceGrid/Activator.cpp index e13f3ef48c9..31cbcaf87bb 100644 --- a/cpp/src/IceGrid/Activator.cpp +++ b/cpp/src/IceGrid/Activator.cpp @@ -329,7 +329,6 @@ Activator::Activator(const TraceLevelsPtr& traceLevels) : fcntl(_fdIntrRead, F_SETFL, flags); #endif - } Activator::~Activator() @@ -685,7 +684,6 @@ Activator::activate(const string& name, throw ex; } - // // Convert to standard argc/argv. // @@ -958,7 +956,6 @@ Activator::kill(const string& name) sendSignal(name, SIGKILL); } - void Activator::sendSignal(const string& name, const string& signal) { diff --git a/cpp/src/IceGrid/AdminCallbackRouter.cpp b/cpp/src/IceGrid/AdminCallbackRouter.cpp index 21191b06954..39b697b800b 100644 --- a/cpp/src/IceGrid/AdminCallbackRouter.cpp +++ b/cpp/src/IceGrid/AdminCallbackRouter.cpp @@ -54,7 +54,6 @@ IceGrid::AdminCallbackRouter::removeMapping(const string& category) assert(one == 1); } - void IceGrid::AdminCallbackRouter::ice_invoke_async(const AMD_Object_ice_invokePtr& cb, const pair<const Byte*, const Byte*>& inParams, @@ -72,10 +71,8 @@ IceGrid::AdminCallbackRouter::ice_invoke_async(const AMD_Object_ice_invokePtr& c con = p->second; } - ObjectPrx target = con->createProxy(current.id)->ice_facet(current.facet); - // // Call with AMI // diff --git a/cpp/src/IceGrid/AdminI.cpp b/cpp/src/IceGrid/AdminI.cpp index 344fa0a1876..74ca87efb3a 100644 --- a/cpp/src/IceGrid/AdminI.cpp +++ b/cpp/src/IceGrid/AdminI.cpp @@ -23,7 +23,6 @@ #include <IceGrid/AdminSessionI.h> #include <IceGrid/NodeSessionI.h> - using namespace std; using namespace Ice; using namespace IceGrid; @@ -139,7 +138,6 @@ private: const AmdCB _cb; }; - template<typename AmdCB> PatcherFeedbackAggregatorPtr static newPatcherFeedback(const AmdCB& cb, Ice::Identity id, @@ -165,7 +163,6 @@ AdminI::~AdminI() { } - void AdminI::addApplication(const ApplicationDescriptor& descriptor, const Current&) { @@ -451,7 +448,6 @@ private: } - void AdminI::startServer_async(const AMD_Admin_startServerPtr& amdCB, const string& id, const Current&) { @@ -683,7 +679,6 @@ AdminI::updateObject(const Ice::ObjectPrx& proxy, const ::Ice::Current&) throw DeploymentException("proxy is null"); } - const Ice::Identity id = proxy->ice_getIdentity(); if(id.category == _database->getInstanceName()) { @@ -878,7 +873,6 @@ AdminI::getNodeHostname(const string& name, const Current&) const } } - StringSeq AdminI::getAllNodeNames(const Current&) const { diff --git a/cpp/src/IceGrid/AdminRouter.h b/cpp/src/IceGrid/AdminRouter.h index b6fb4ac2c35..3e8de89aeb4 100644 --- a/cpp/src/IceGrid/AdminRouter.h +++ b/cpp/src/IceGrid/AdminRouter.h @@ -25,7 +25,6 @@ protected: AdminRouter(const TraceLevelsPtr&); - void invokeOnTarget(const Ice::ObjectPrx&, const Ice::AMD_Object_ice_invokePtr&, const std::pair<const Ice::Byte*, const Ice::Byte*>&, diff --git a/cpp/src/IceGrid/AdminSessionI.cpp b/cpp/src/IceGrid/AdminSessionI.cpp index 7f598c2223e..4a7032b5011 100644 --- a/cpp/src/IceGrid/AdminSessionI.cpp +++ b/cpp/src/IceGrid/AdminSessionI.cpp @@ -22,7 +22,6 @@ using namespace IceGrid; namespace { - class SubscriberForwarderI : public Ice::BlobjectArrayAsync { class CallbackI: public IceUtil::Shared diff --git a/cpp/src/IceGrid/Database.cpp b/cpp/src/IceGrid/Database.cpp index 7d6c0da1c2f..d50d912cff1 100644 --- a/cpp/src/IceGrid/Database.cpp +++ b/cpp/src/IceGrid/Database.cpp @@ -1775,7 +1775,6 @@ Database::getObjectByTypeOnLeastLoadedNode(const string& type, LoadSample sample return min_element(objectsWithLoad.begin(), objectsWithLoad.end(), ObjectLoadCI())->first; } - Ice::ObjectProxySeq Database::getObjectsByType(const string& type, const Ice::ConnectionPtr& con, const Ice::Context& ctx) { diff --git a/cpp/src/IceGrid/Database.h b/cpp/src/IceGrid/Database.h index 18b3f55f160..aa545812d76 100644 --- a/cpp/src/IceGrid/Database.h +++ b/cpp/src/IceGrid/Database.h @@ -66,7 +66,6 @@ public: using IceUtil::Monitor<IceUtil::Mutex>::unlock; #endif - Database(const Ice::ObjectAdapterPtr&, const IceStorm::TopicManagerPrx&, const std::string&, const TraceLevelsPtr&, const RegistryInfo&, bool); diff --git a/cpp/src/IceGrid/DescriptorBuilder.cpp b/cpp/src/IceGrid/DescriptorBuilder.cpp index 62cf0eb7f8f..f7513cf49c6 100644 --- a/cpp/src/IceGrid/DescriptorBuilder.cpp +++ b/cpp/src/IceGrid/DescriptorBuilder.cpp @@ -727,7 +727,6 @@ CommunicatorDescriptorBuilder::addDbEnv(const XmlAttributesHelper& attrs) DbEnvDescriptor desc; desc.name = attrs("name"); - DbEnvDescriptorSeq::iterator p; for(p = _descriptor->dbEnvs.begin(); p != _descriptor->dbEnvs.end(); ++p) { diff --git a/cpp/src/IceGrid/DescriptorHelper.h b/cpp/src/IceGrid/DescriptorHelper.h index e39000da109..577869525e8 100644 --- a/cpp/src/IceGrid/DescriptorHelper.h +++ b/cpp/src/IceGrid/DescriptorHelper.h @@ -184,7 +184,6 @@ protected: const std::map<std::string, std::string>&) const; }; - class ServiceInstanceHelper : public InstanceHelper { public: @@ -206,7 +205,6 @@ private: mutable ServiceHelper _service; }; - class IceBoxHelper : public ServerHelper { public: diff --git a/cpp/src/IceGrid/Grammar.y b/cpp/src/IceGrid/Grammar.y index 1667432b98b..7c8aa0e033b 100644 --- a/cpp/src/IceGrid/Grammar.y +++ b/cpp/src/IceGrid/Grammar.y @@ -639,7 +639,6 @@ command } ; - // ---------------------------------------------------------------------- strings // ---------------------------------------------------------------------- diff --git a/cpp/src/IceGrid/IceGridNode.cpp b/cpp/src/IceGrid/IceGridNode.cpp index d28f0ec6e4c..129b2f3378c 100644 --- a/cpp/src/IceGrid/IceGridNode.cpp +++ b/cpp/src/IceGrid/IceGridNode.cpp @@ -55,7 +55,6 @@ private: ProcessPtr _origProcess; }; - class NodeService : public Service { public: @@ -97,7 +96,6 @@ private: ActivatorPtr _activator; }; - #ifdef _WIN32 void setNoIndexingAttribute(const string& pa) @@ -123,7 +121,6 @@ setNoIndexingAttribute(const string& pa) } - CollocatedRegistry::CollocatedRegistry(const CommunicatorPtr& com, const ActivatorPtr& activator, bool nowarn, @@ -204,7 +201,6 @@ NodeService::startImpl(int argc, char* argv[], int& status) string desc; vector<string> targets; - for(int i = 1; i < argc; ++i) { if(strcmp(argv[i], "-h") == 0 || strcmp(argv[i], "--help") == 0) diff --git a/cpp/src/IceGrid/IceGridRegistry.cpp b/cpp/src/IceGrid/IceGridRegistry.cpp index 1c1060d6563..d19bb11be6c 100644 --- a/cpp/src/IceGrid/IceGridRegistry.cpp +++ b/cpp/src/IceGrid/IceGridRegistry.cpp @@ -128,7 +128,6 @@ RegistryService::start(int argc, char* argv[], int& status) out << "you should set individual adapter thread pools instead."; } - TraceLevelsPtr traceLevels = new TraceLevels(communicator(), "IceGrid.Registry"); _registry = new RegistryI(communicator(), traceLevels, nowarn, readonly, initFromReplica, ""); @@ -167,7 +166,6 @@ RegistryService::initializeCommunicator(int& argc, char* argv[], InitializationData initData = initializationData; initData.properties = createProperties(argc, argv, initData.properties); - // If IceGrid.Registry.[Admin]PermissionsVerifier is not set and // IceGrid.Registry.[Admin]CryptPasswords is set, load the // Glacier2CryptPermissionsVerifier plug-in @@ -195,7 +193,6 @@ RegistryService::initializeCommunicator(int& argc, char* argv[], } } - // // Never create Admin object in Ice.Admin adapter // @@ -219,7 +216,6 @@ RegistryService::initializeCommunicator(int& argc, char* argv[], // initData.properties->setProperty("Ice.ACM.Close", "3"); - return Service::initializeCommunicator(argc, argv, initData, version); } diff --git a/cpp/src/IceGrid/Internal.ice b/cpp/src/IceGrid/Internal.ice index f136dd99564..81086130808 100644 --- a/cpp/src/IceGrid/Internal.ice +++ b/cpp/src/IceGrid/Internal.ice @@ -803,5 +803,4 @@ interface InternalRegistry extends FileReader ["cpp:const"] idempotent void shutdown(); } - } diff --git a/cpp/src/IceGrid/LocatorI.cpp b/cpp/src/IceGrid/LocatorI.cpp index b680eaebcd7..39f72078704 100644 --- a/cpp/src/IceGrid/LocatorI.cpp +++ b/cpp/src/IceGrid/LocatorI.cpp @@ -291,7 +291,6 @@ public: } } - for(LocatorAdapterInfoSeq::const_iterator p = adapters.begin(); p != adapters.end(); ++p) { if(_locator->getDirectProxy(*p, this)) @@ -811,7 +810,6 @@ private: }; - LocatorI::LocatorI(const Ice::CommunicatorPtr& communicator, const DatabasePtr& database, const WellKnownObjectsManagerPtr& wellKnownObjects, diff --git a/cpp/src/IceGrid/Makefile.mk b/cpp/src/IceGrid/Makefile.mk index bd7f8c02362..d40fea4d19f 100644 --- a/cpp/src/IceGrid/Makefile.mk +++ b/cpp/src/IceGrid/Makefile.mk @@ -82,5 +82,4 @@ icegridregistry_cppflags := $(if $(lmdb_includedir),-I$(lmdb_includedir)) icegridadmin_dependencies := IcePatch2 IceBox IceXML IceLocatorDiscovery icegridadmin_sources := $(addprefix $(currentdir)/,$(local_admin_srcs)) - projects += $(project) diff --git a/cpp/src/IceGrid/NodeAdminRouter.cpp b/cpp/src/IceGrid/NodeAdminRouter.cpp index 8f3e1a5ddc4..d83b22468a5 100644 --- a/cpp/src/IceGrid/NodeAdminRouter.cpp +++ b/cpp/src/IceGrid/NodeAdminRouter.cpp @@ -16,7 +16,6 @@ using namespace IceGrid; using namespace Ice; using namespace std; - IceGrid::NodeServerAdminRouter::NodeServerAdminRouter(const NodeIPtr& node) : AdminRouter(node->getTraceLevels()), _node(node) diff --git a/cpp/src/IceGrid/NodeI.cpp b/cpp/src/IceGrid/NodeI.cpp index b5e6d7ad2f5..b796dab7d78 100644 --- a/cpp/src/IceGrid/NodeI.cpp +++ b/cpp/src/IceGrid/NodeI.cpp @@ -431,7 +431,6 @@ NodeI::destroyServer_async(const AMD_Node_destroyServerPtr& amdCB, destroyServer(amdCB, serverId, uuid, revision, replicaName, false, current); } - void NodeI::destroyServerWithoutRestart_async(const AMD_Node_destroyServerWithoutRestartPtr& amdCB, const string& serverId, @@ -493,7 +492,6 @@ NodeI::patch_async(const AMD_Node_patchPtr& amdCB, _patchInProgress.insert(application); } - set<ServerIPtr> servers; bool patchApplication = !appDistrib->icepatch.empty(); if(server.empty()) @@ -1345,8 +1343,6 @@ NodeI::getApplicationServers(const string& application) const return servers; } - - string NodeI::getFilePath(const string& filename) const { diff --git a/cpp/src/IceGrid/Parser.cpp b/cpp/src/IceGrid/Parser.cpp index 2a6bac7606d..685c043d2b3 100644 --- a/cpp/src/IceGrid/Parser.cpp +++ b/cpp/src/IceGrid/Parser.cpp @@ -1441,7 +1441,6 @@ Parser::signalServer(const list<string>& args) } } - void Parser::writeMessage(const list<string>& args, int fd) { @@ -1936,7 +1935,6 @@ Parser::listServices(const list<string>& args) } } - void Parser::endpointsAdapter(const list<string>& args) { diff --git a/cpp/src/IceGrid/Parser.h b/cpp/src/IceGrid/Parser.h index 9ca105639b5..cb03f21f37e 100644 --- a/cpp/src/IceGrid/Parser.h +++ b/cpp/src/IceGrid/Parser.h @@ -160,7 +160,6 @@ private: void showFile(const std::string&, const std::string&, const std::string&, bool, bool, bool, int); void showLog(const std::string&, const std::string&, bool, bool, int); - std::string _commands; Ice::CommunicatorPtr _communicator; AdminSessionPrx _session; diff --git a/cpp/src/IceGrid/PlatformInfo.cpp b/cpp/src/IceGrid/PlatformInfo.cpp index ba303edf6de..0671f100cb7 100644 --- a/cpp/src/IceGrid/PlatformInfo.cpp +++ b/cpp/src/IceGrid/PlatformInfo.cpp @@ -268,7 +268,6 @@ PlatformInfo::PlatformInfo(const string& prefix, # pragma warning (default : 4996) # endif - DWORD major = osInfo.dwMajorVersion; DWORD minor = osInfo.dwMinorVersion; DWORD build = osInfo.dwBuildNumber; diff --git a/cpp/src/IceGrid/PlatformInfo.h b/cpp/src/IceGrid/PlatformInfo.h index c66d73157c8..649f2303a9b 100644 --- a/cpp/src/IceGrid/PlatformInfo.h +++ b/cpp/src/IceGrid/PlatformInfo.h @@ -18,8 +18,6 @@ # include <deque> #endif - - namespace IceGrid { @@ -86,7 +84,6 @@ private: }; - }; #endif diff --git a/cpp/src/IceGrid/ReapThread.h b/cpp/src/IceGrid/ReapThread.h index 2174a2dbb8b..3f3b762a010 100644 --- a/cpp/src/IceGrid/ReapThread.h +++ b/cpp/src/IceGrid/ReapThread.h @@ -115,7 +115,6 @@ public: } }; - class ReapThread : public IceUtil::Thread, public IceUtil::Monitor<IceUtil::Mutex> { public: diff --git a/cpp/src/IceGrid/RegistryAdminRouter.cpp b/cpp/src/IceGrid/RegistryAdminRouter.cpp index 294d802507e..e94f29d31d3 100644 --- a/cpp/src/IceGrid/RegistryAdminRouter.cpp +++ b/cpp/src/IceGrid/RegistryAdminRouter.cpp @@ -98,7 +98,6 @@ IceGrid::RegistryServerAdminRouter::ice_invoke_async(const AMD_Object_ice_invoke invokeOnTarget(target, cb, inParams, current); } - IceGrid::RegistryNodeAdminRouter::RegistryNodeAdminRouter(const string& collocNodeName, const DatabasePtr& database) : AdminRouter(database->getTraceLevels()), _collocNodeName(collocNodeName), @@ -148,8 +147,6 @@ IceGrid::RegistryNodeAdminRouter::ice_invoke_async(const AMD_Object_ice_invokePt invokeOnTarget(target, cb, inParams, current); } - - IceGrid::RegistryReplicaAdminRouter::RegistryReplicaAdminRouter(const string& name, const DatabasePtr& database) : AdminRouter(database->getTraceLevels()), diff --git a/cpp/src/IceGrid/RegistryAdminRouter.h b/cpp/src/IceGrid/RegistryAdminRouter.h index 7030f7c8ed2..f197861de86 100644 --- a/cpp/src/IceGrid/RegistryAdminRouter.h +++ b/cpp/src/IceGrid/RegistryAdminRouter.h @@ -31,7 +31,6 @@ private: const DatabasePtr _database; }; - class RegistryNodeAdminRouter : public AdminRouter { public: @@ -64,6 +63,5 @@ private: const DatabasePtr _database; }; - } #endif diff --git a/cpp/src/IceGrid/RegistryI.cpp b/cpp/src/IceGrid/RegistryI.cpp index 3e4405d0d03..42601b43e1f 100644 --- a/cpp/src/IceGrid/RegistryI.cpp +++ b/cpp/src/IceGrid/RegistryI.cpp @@ -1462,7 +1462,6 @@ RegistryI::registerReplicas(const InternalRegistryPrx& internalRegistry, const N out << "creating replica `" << replicaName << "' session"; } - try { replica->end_registerWithReplica(*p); diff --git a/cpp/src/IceGrid/ServerCache.cpp b/cpp/src/IceGrid/ServerCache.cpp index 7051f608430..ad4e264df12 100644 --- a/cpp/src/IceGrid/ServerCache.cpp +++ b/cpp/src/IceGrid/ServerCache.cpp @@ -73,7 +73,6 @@ namespace IceGrid const ServerEntryPtr _entry; }; - } CheckUpdateResult::CheckUpdateResult(const string& server, @@ -1138,7 +1137,6 @@ ServerEntry::allocated(const SessionIPtr& session) _load->sessionId = session->getId(); } - Glacier2::IdentitySetPrx identitySet = session->getGlacier2IdentitySet(); Glacier2::StringSetPrx adapterIdSet = session->getGlacier2AdapterIdSet(); if(identitySet && adapterIdSet) diff --git a/cpp/src/IceGrid/ServerI.cpp b/cpp/src/IceGrid/ServerI.cpp index 243a43e1519..767dce8f475 100644 --- a/cpp/src/IceGrid/ServerI.cpp +++ b/cpp/src/IceGrid/ServerI.cpp @@ -2662,7 +2662,6 @@ ServerI::checkAndUpdateUser(const InternalServerDescriptorPtr& desc, bool /*upda throw "node has insufficient privileges to load server under user account `" + user + "'"; } - if(pw->pw_uid == 0 && _node->getCommunicator()->getProperties()->getPropertyAsInt("IceGrid.Node.AllowRunningServersAsRoot") <= 0) { diff --git a/cpp/src/IceGrid/Util.h b/cpp/src/IceGrid/Util.h index 2bf1cff7f90..fdc717f73de 100644 --- a/cpp/src/IceGrid/Util.h +++ b/cpp/src/IceGrid/Util.h @@ -29,7 +29,6 @@ struct RandomNumberGenerator : public std::unary_function<ptrdiff_t, ptrdiff_t> } }; - template<typename T> std::insert_iterator<T> inline set_inserter(T& container) { diff --git a/cpp/src/IceLocatorDiscovery/PluginI.cpp b/cpp/src/IceLocatorDiscovery/PluginI.cpp index 79d8f7492e0..6cb65ce4ed6 100644 --- a/cpp/src/IceLocatorDiscovery/PluginI.cpp +++ b/cpp/src/IceLocatorDiscovery/PluginI.cpp @@ -30,7 +30,6 @@ typedef std::pair<function<void(bool, const pair<const Ice::Byte*, const Ice::By typedef Ice::AMD_Object_ice_invokePtr AMDCallback; #endif - class Request : #ifdef ICE_CPP11_MAPPING public std::enable_shared_from_this<Request> @@ -474,7 +473,6 @@ Request::invoke(const Ice::LocatorPrxPtr& l) #endif } - void Request::response(bool ok, const pair<const Ice::Byte*, const Ice::Byte*>& outParams) { diff --git a/cpp/src/IcePatch2Lib/ClientUtil.cpp b/cpp/src/IcePatch2Lib/ClientUtil.cpp index 8551234b666..9f7be8b649f 100644 --- a/cpp/src/IcePatch2Lib/ClientUtil.cpp +++ b/cpp/src/IcePatch2Lib/ClientUtil.cpp @@ -20,7 +20,6 @@ using namespace IceUtil; using namespace IcePatch2; using namespace IcePatch2Internal; - IcePatch2::Patcher::~Patcher() { // Out of line to avoid weak vtable @@ -199,7 +198,6 @@ Decompressor::run() } } - PatcherI::PatcherI(const CommunicatorPtr& communicator, const PatcherFeedbackPtr& feedback) : _feedback(feedback), _dataDir(communicator->getProperties()->getPropertyWithDefault("IcePatch2Client.Directory", ".")), diff --git a/cpp/src/IceSSL/AcceptorI.cpp b/cpp/src/IceSSL/AcceptorI.cpp index ccb8b65a143..68efd03c04f 100644 --- a/cpp/src/IceSSL/AcceptorI.cpp +++ b/cpp/src/IceSSL/AcceptorI.cpp @@ -28,7 +28,6 @@ IceSSL::AcceptorI::getNativeInfo() return _delegate->getNativeInfo(); } - #if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP) IceInternal::AsyncInfo* IceSSL::AcceptorI::getAsyncInfo(IceInternal::SocketOperation status) diff --git a/cpp/src/IceSSL/CertificateI.cpp b/cpp/src/IceSSL/CertificateI.cpp index cc37c6530e8..2946457d1bf 100644 --- a/cpp/src/IceSSL/CertificateI.cpp +++ b/cpp/src/IceSSL/CertificateI.cpp @@ -21,7 +21,6 @@ #include <Ice/StringConverter.h> #include <IceUtil/Time.h> - using namespace std; using namespace Ice; using namespace IceInternal; diff --git a/cpp/src/IceSSL/OpenSSLUtil.cpp b/cpp/src/IceSSL/OpenSSLUtil.cpp index ae8e5a550af..1d5853d7631 100644 --- a/cpp/src/IceSSL/OpenSSLUtil.cpp +++ b/cpp/src/IceSSL/OpenSSLUtil.cpp @@ -30,7 +30,6 @@ namespace // Hellman parameters. // - static DH* convertDH(const unsigned char* buf, int len) { diff --git a/cpp/src/IceSSL/SChannelEngine.cpp b/cpp/src/IceSSL/SChannelEngine.cpp index 2d378344ac2..289d04b69e0 100644 --- a/cpp/src/IceSSL/SChannelEngine.cpp +++ b/cpp/src/IceSSL/SChannelEngine.cpp @@ -31,7 +31,6 @@ const int ICESSL_CALG_ECDH_EPHEM = 0x0000AE06; - // // COMPILERFIX SCH_USE_STRONG_CRYPTO not defined with VC90 // @@ -307,7 +306,6 @@ findCertificates(const string& location, const string& name, const string& value return certs; } - #if defined(__MINGW32__) || (defined(_MSC_VER) && (_MSC_VER <= 1500)) // // CERT_CHAIN_ENGINE_CONFIG struct in mingw headers doesn't include diff --git a/cpp/src/IceSSL/SecureTransportCertificateI.cpp b/cpp/src/IceSSL/SecureTransportCertificateI.cpp index 00b60e1854b..b215d5dbf80 100644 --- a/cpp/src/IceSSL/SecureTransportCertificateI.cpp +++ b/cpp/src/IceSSL/SecureTransportCertificateI.cpp @@ -220,7 +220,6 @@ private: #endif - class SecureTransportCertificateI : public IceSSL::SecureTransport::Certificate, public IceSSL::CertificateI { diff --git a/cpp/src/IceSSL/SecureTransportEngine.cpp b/cpp/src/IceSSL/SecureTransportEngine.cpp index 4b8d65ef53b..bd03138fc59 100644 --- a/cpp/src/IceSSL/SecureTransportEngine.cpp +++ b/cpp/src/IceSSL/SecureTransportEngine.cpp @@ -1019,7 +1019,6 @@ IceSSL::SecureTransport::SSLEngine::createTransceiver(const InstancePtr& instanc return new IceSSL::SecureTransport::TransceiverI(instance, delegate, hostOrAdapterName, incoming); } - SSLContextRef IceSSL::SecureTransport::SSLEngine::newContext(bool incoming) { diff --git a/cpp/src/IceSSL/SecureTransportUtil.cpp b/cpp/src/IceSSL/SecureTransportUtil.cpp index 1ae54e0754d..a50fa3f075a 100644 --- a/cpp/src/IceSSL/SecureTransportUtil.cpp +++ b/cpp/src/IceSSL/SecureTransportUtil.cpp @@ -28,7 +28,6 @@ using namespace IceSSL; using namespace IceSSL::SecureTransport; using namespace std; - namespace { diff --git a/cpp/src/IceSSL/SecureTransportUtil.h b/cpp/src/IceSSL/SecureTransportUtil.h index e508a41776d..9ee2ce05b08 100644 --- a/cpp/src/IceSSL/SecureTransportUtil.h +++ b/cpp/src/IceSSL/SecureTransportUtil.h @@ -39,7 +39,6 @@ SecCertificateRef loadCertificate(const std::string&); CFArrayRef loadCACertificates(const std::string&); CFArrayRef findCertificateChain(const std::string&, const std::string&, const std::string&); - } // SecureTransport namespace end } // IceSSL namespace end diff --git a/cpp/src/IceStorm/Instance.h b/cpp/src/IceStorm/Instance.h index 7007998a650..dd4453af683 100644 --- a/cpp/src/IceStorm/Instance.h +++ b/cpp/src/IceStorm/Instance.h @@ -10,7 +10,6 @@ #ifndef INSTANCE_H #define INSTANCE_H - #include <Ice/CommunicatorF.h> #include <Ice/ObjectAdapterF.h> #include <Ice/PropertiesF.h> @@ -123,7 +122,6 @@ private: IceUtil::TimerPtr _timer; IceStorm::Instrumentation::TopicManagerObserverPtr _observer; - }; typedef IceUtil::Handle<Instance> InstancePtr; diff --git a/cpp/src/IceStorm/Observers.cpp b/cpp/src/IceStorm/Observers.cpp index d63f849129d..b1af1044a7f 100644 --- a/cpp/src/IceStorm/Observers.cpp +++ b/cpp/src/IceStorm/Observers.cpp @@ -155,7 +155,6 @@ Observers::destroyTopic(const LogUpdate& llu, const string& id) wait("destroyTopic"); } - void Observers::addSubscriber(const LogUpdate& llu, const string& name, const SubscriberRecord& rec) { diff --git a/cpp/src/IceStorm/Observers.h b/cpp/src/IceStorm/Observers.h index 5b98ae3fcd7..6b4d9f0cbc3 100644 --- a/cpp/src/IceStorm/Observers.h +++ b/cpp/src/IceStorm/Observers.h @@ -19,7 +19,6 @@ # pragma error_messages(off,hidef) #endif - namespace IceStorm { class Instance; diff --git a/cpp/src/IceStorm/Service.h b/cpp/src/IceStorm/Service.h index 469ec77de1e..356b7e40252 100644 --- a/cpp/src/IceStorm/Service.h +++ b/cpp/src/IceStorm/Service.h @@ -35,7 +35,6 @@ # endif #endif - // This API is internal to Ice, and should not be used by external // applications. namespace IceStormInternal diff --git a/cpp/src/IceStorm/Subscriber.cpp b/cpp/src/IceStorm/Subscriber.cpp index 6a12b8509aa..f0512d73d78 100644 --- a/cpp/src/IceStorm/Subscriber.cpp +++ b/cpp/src/IceStorm/Subscriber.cpp @@ -931,7 +931,6 @@ Subscriber::completed(const Ice::AsyncResultPtr& result) } } - void Subscriber::shutdown() { diff --git a/cpp/src/IceStorm/SubscriberRecord.ice b/cpp/src/IceStorm/SubscriberRecord.ice index a7624d9247e..15a30aea8ac 100644 --- a/cpp/src/IceStorm/SubscriberRecord.ice +++ b/cpp/src/IceStorm/SubscriberRecord.ice @@ -17,7 +17,6 @@ module IceStorm { - /** * * The key for persistent subscribers, or topics. diff --git a/cpp/src/IceStorm/TopicI.cpp b/cpp/src/IceStorm/TopicI.cpp index 55f52489158..a9549467bc0 100644 --- a/cpp/src/IceStorm/TopicI.cpp +++ b/cpp/src/IceStorm/TopicI.cpp @@ -1017,7 +1017,6 @@ TopicImpl::publish(bool forwarded, const EventDataSeq& events) generation = unlock.generation(); } - // Tell the master to reap this set of subscribers. This is an // AMI invocation so it shouldn't block the caller (in the // typical case) we do it outside of the mutex lock for @@ -1118,7 +1117,6 @@ TopicImpl::observerRemoveSubscriber(const LogUpdate& llu, const Ice::IdentitySeq IceUtil::Mutex::Lock sync(_subscribersMutex); - // First remove from the database. try { diff --git a/cpp/src/IceStorm/TopicManagerI.cpp b/cpp/src/IceStorm/TopicManagerI.cpp index 8e9cfe33de1..db815c72654 100644 --- a/cpp/src/IceStorm/TopicManagerI.cpp +++ b/cpp/src/IceStorm/TopicManagerI.cpp @@ -268,7 +268,6 @@ TopicManagerImpl::TopicManagerImpl(const PersistentInstancePtr& instance) : LogUpdate empty = {0, 0}; _instance->lluMap().put(txn, lluDbKey, empty); - // Recreate each of the topics. SubscriberRecordKey k; SubscriberRecord v; diff --git a/cpp/src/IceUtil/ConvertUTF.cpp b/cpp/src/IceUtil/ConvertUTF.cpp index f2e5d37b7e3..c8501dac76e 100644 --- a/cpp/src/IceUtil/ConvertUTF.cpp +++ b/cpp/src/IceUtil/ConvertUTF.cpp @@ -83,7 +83,6 @@ const UTF32 halfMask = 0x3FFUL; // #define false 0 // #define true 1 - /* --------------------------------------------------------------------- */ /* @@ -446,7 +445,6 @@ ConversionResult ConvertUTF8toUTF32 ( --------------------------------------------------------------------- */ - /* --------------------------------------------------------------------- */ /* diff --git a/cpp/src/IceUtil/ConvertUTF.h b/cpp/src/IceUtil/ConvertUTF.h index aa7928c7a70..ba6016861d1 100644 --- a/cpp/src/IceUtil/ConvertUTF.h +++ b/cpp/src/IceUtil/ConvertUTF.h @@ -91,7 +91,6 @@ ------------------------------------------------------------------------ */ - namespace IceUtilInternal { @@ -109,7 +108,6 @@ enum ConversionResult sourceIllegal /* source sequence is illegal/malformed */ }; - /* --------------------------------------------------------------------- The following 4 definitions are compiler-specific. The C standard does not guarantee that wchar_t has at least @@ -130,7 +128,6 @@ typedef bool Boolean; /* 0 or 1 */ #define UNI_MAX_UTF32 static_cast<UTF32>(0x7FFFFFFF) #define UNI_MAX_LEGAL_UTF32 static_cast<UTF32>(0x0010FFFF) - ConversionResult ConvertUTF8toUTF16( const UTF8** sourceStart, const UTF8* sourceEnd, UTF16** targetStart, UTF16* targetEnd, ConversionFlags flags); diff --git a/cpp/src/IceUtil/CtrlCHandler.cpp b/cpp/src/IceUtil/CtrlCHandler.cpp index a7900cfa0b9..79c52ea0a69 100644 --- a/cpp/src/IceUtil/CtrlCHandler.cpp +++ b/cpp/src/IceUtil/CtrlCHandler.cpp @@ -106,7 +106,6 @@ static BOOL WINAPI handlerRoutine(DWORD dwCtrlType) return TRUE; } - CtrlCHandler::CtrlCHandler(CtrlCHandlerCallback callback) { IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(globalMutex); diff --git a/cpp/src/IceUtil/OutputUtil.cpp b/cpp/src/IceUtil/OutputUtil.cpp index e7e0d043f4f..0af818ab534 100644 --- a/cpp/src/IceUtil/OutputUtil.cpp +++ b/cpp/src/IceUtil/OutputUtil.cpp @@ -71,7 +71,6 @@ IceUtilInternal::OutputBase::OutputBase(ostream& os) : { } - IceUtilInternal::OutputBase::OutputBase(const string& s) : _out(_fout), _pos(0), diff --git a/cpp/src/IceUtil/StringConverter.cpp b/cpp/src/IceUtil/StringConverter.cpp index 246c25b54e9..8949577b611 100644 --- a/cpp/src/IceUtil/StringConverter.cpp +++ b/cpp/src/IceUtil/StringConverter.cpp @@ -259,7 +259,6 @@ public: Init init; - const WstringConverterPtr& getUnicodeWstringConverter() { @@ -458,7 +457,6 @@ typedef char32_t Char32T; #endif - vector<unsigned short> IceUtilInternal::toUTF16(const vector<Byte>& source) { @@ -526,7 +524,6 @@ IceUtilInternal::toUTF32(const vector<Byte>& source) return result; } - vector<Byte> IceUtilInternal::fromUTF32(const vector<unsigned int>& source) { diff --git a/cpp/src/IceUtil/StringUtil.cpp b/cpp/src/IceUtil/StringUtil.cpp index a5c8f15a5d7..b69f247c0e5 100644 --- a/cpp/src/IceUtil/StringUtil.cpp +++ b/cpp/src/IceUtil/StringUtil.cpp @@ -33,7 +33,6 @@ toHexDigit(Byte b) } } - unsigned int addContinuationByte(string::iterator& p, string::iterator end, unsigned int codePoint) { diff --git a/cpp/src/IceUtil/ThreadException.cpp b/cpp/src/IceUtil/ThreadException.cpp index 769cd264d3d..8d681fe108b 100644 --- a/cpp/src/IceUtil/ThreadException.cpp +++ b/cpp/src/IceUtil/ThreadException.cpp @@ -49,7 +49,6 @@ IceUtil::ThreadLockedException::ice_clone() const } #endif - IceUtil::ThreadStartedException::ThreadStartedException(const char* file, int line) : ExceptionHelper<ThreadStartedException>(file, line) { @@ -80,7 +79,6 @@ IceUtil::ThreadNotStartedException::ice_id() const return "::IceUtil::ThreadNotStartedException"; } - #ifndef ICE_CPP11_MAPPING IceUtil::ThreadNotStartedException* IceUtil::ThreadNotStartedException::ice_clone() const @@ -89,7 +87,6 @@ IceUtil::ThreadNotStartedException::ice_clone() const } #endif - IceUtil::BadThreadControlException::BadThreadControlException(const char* file, int line) : ExceptionHelper<BadThreadControlException>(file, line) { diff --git a/cpp/src/IceUtil/Unicode.cpp b/cpp/src/IceUtil/Unicode.cpp index a82fc3b772c..4c5914a2c51 100644 --- a/cpp/src/IceUtil/Unicode.cpp +++ b/cpp/src/IceUtil/Unicode.cpp @@ -32,7 +32,6 @@ namespace // template<size_t wcharSize> struct WstringHelper; - template<> struct WstringHelper<2> { diff --git a/cpp/src/IceUtil/Unicode.h b/cpp/src/IceUtil/Unicode.h index a6d6d5d2a2b..cc963b8f4da 100644 --- a/cpp/src/IceUtil/Unicode.h +++ b/cpp/src/IceUtil/Unicode.h @@ -30,7 +30,6 @@ bool convertUTFWstringToUTF8(const wchar_t*& sourceStart, const wchar_t* sourceEnd, IceUtil::Byte*& targetStart, IceUtil::Byte* targetEnd); - void convertUTF8ToUTFWstring(const IceUtil::Byte*& sourceStart, const IceUtil::Byte* sourceEnd, std::wstring& target); diff --git a/cpp/src/IceUtil/UtilException.cpp b/cpp/src/IceUtil/UtilException.cpp index 3a51e5824d7..3c85b32ed53 100644 --- a/cpp/src/IceUtil/UtilException.cpp +++ b/cpp/src/IceUtil/UtilException.cpp @@ -297,7 +297,6 @@ handlePcInfoError(void* data, const char* msg, int errnum) frameInfo.setByErrorCb = true; } - int addFrame(void* sf, uintptr_t pc) { @@ -353,7 +352,6 @@ getStackFrames() return stackFrames; } - string getStackTrace(const vector<void*>& stackFrames) { @@ -626,7 +624,6 @@ IceUtil::NullHandleException::ice_clone() const } #endif - IceUtil::IllegalArgumentException::IllegalArgumentException(const char* file, int line) : ExceptionHelper<IllegalArgumentException>(file, line) { @@ -720,8 +717,6 @@ IceUtil::IllegalConversionException::reason() const return _reason; } - - IceUtil::SyscallException::SyscallException(const char* file, int line, int err ): ExceptionHelper<SyscallException>(file, line), _error(err) @@ -764,7 +759,6 @@ IceUtil::SyscallException::error() const return _error; } - IceUtil::FileLockException::FileLockException(const char* file, int line, int err, const string& path): ExceptionHelper<FileLockException>(file, line), _error(err), diff --git a/cpp/src/Slice/CPlusPlusUtil.cpp b/cpp/src/Slice/CPlusPlusUtil.cpp index a6e0408189f..4c0667aa6ad 100644 --- a/cpp/src/Slice/CPlusPlusUtil.cpp +++ b/cpp/src/Slice/CPlusPlusUtil.cpp @@ -67,7 +67,6 @@ toOptional(const string& s, int typeCtx) return result; } - string stringTypeToString(const TypePtr& type, const StringList& metaData, int typeCtx) { @@ -348,7 +347,6 @@ writeMarshalUnmarshalParams(Output& out, const ParamDeclList& params, const Oper } } - if(!requiredParams.empty() || (op && op->returnType() && !op->returnIsOptional())) { if(cpp11) @@ -513,7 +511,6 @@ Slice::ToIfdef::operator()(char c) } } - void Slice::printHeader(Output& out) { @@ -1781,7 +1778,6 @@ Slice::inWstringModule(const SequencePtr& seq) return false; } - string Slice::getDataMemberRef(const DataMemberPtr& p) { diff --git a/cpp/src/Slice/FileTracker.cpp b/cpp/src/Slice/FileTracker.cpp index 20dfc7ae93c..9379ed6ee01 100644 --- a/cpp/src/Slice/FileTracker.cpp +++ b/cpp/src/Slice/FileTracker.cpp @@ -7,7 +7,6 @@ // // ********************************************************************** - #include <Slice/FileTracker.h> #include <IceUtil/ConsoleUtil.h> #include <IceUtil/FileUtil.h> @@ -60,7 +59,6 @@ Slice::FileException::reason() const return _reason; } - static Slice::FileTrackerPtr Instance; Slice::FileTracker::FileTracker() : diff --git a/cpp/src/Slice/Grammar.y b/cpp/src/Slice/Grammar.y index 0c4900ec2f3..0ff80451885 100644 --- a/cpp/src/Slice/Grammar.y +++ b/cpp/src/Slice/Grammar.y @@ -108,7 +108,6 @@ slice_error(const char* s) %% - // ---------------------------------------------------------------------- start // ---------------------------------------------------------------------- diff --git a/cpp/src/Slice/JavaUtil.cpp b/cpp/src/Slice/JavaUtil.cpp index 3d0784e3e37..9b3b1b81f53 100644 --- a/cpp/src/Slice/JavaUtil.cpp +++ b/cpp/src/Slice/JavaUtil.cpp @@ -3218,7 +3218,6 @@ Slice::JavaCompatGenerator::sequenceHasHolder(const SequencePtr& p) const return true; } - JavaOutput* Slice::JavaCompatGenerator::createOutput() { diff --git a/cpp/src/Slice/JavaUtil.h b/cpp/src/Slice/JavaUtil.h index ce16795bdb2..2ae8f2ebd3d 100644 --- a/cpp/src/Slice/JavaUtil.h +++ b/cpp/src/Slice/JavaUtil.h @@ -97,7 +97,6 @@ protected: const std::string& = std::string(), const std::string& = std::string()) const; - // // Returns the package prefix for a give Slice file. // @@ -264,7 +263,6 @@ protected: const std::string& = std::string(), const std::string& = std::string()) const; - // // Returns the package prefix for a give Slice file. // diff --git a/cpp/src/Slice/MD5I.cpp b/cpp/src/Slice/MD5I.cpp index c74241e8491..79071b34452 100644 --- a/cpp/src/Slice/MD5I.cpp +++ b/cpp/src/Slice/MD5I.cpp @@ -131,7 +131,6 @@ #define T63 0x2ad7d2bb #define T64 /* 0xeb86d391 */ (T_MASK ^ 0x14792c6e) - static void md5_process(md5_state_t *pms, const md5_byte_t *data /*[64]*/) { diff --git a/cpp/src/Slice/Parser.cpp b/cpp/src/Slice/Parser.cpp index 593cf4c846e..4b701381319 100644 --- a/cpp/src/Slice/Parser.cpp +++ b/cpp/src/Slice/Parser.cpp @@ -1538,7 +1538,6 @@ Slice::Container::unit() const return SyntaxTreeBase::unit(); } - ModuleList Slice::Container::modules() const { @@ -6767,7 +6766,6 @@ Slice::cICompare(const std::string& s1, const std::string& s2) } #endif - // ---------------------------------------------------------------------- // DerivedToBaseCompare // ---------------------------------------------------------------------- diff --git a/cpp/src/Slice/Parser.h b/cpp/src/Slice/Parser.h index 3b593eaf25d..662e289d720 100644 --- a/cpp/src/Slice/Parser.h +++ b/cpp/src/Slice/Parser.h @@ -20,7 +20,6 @@ #include <set> #include <stdio.h> - namespace Slice { @@ -992,7 +991,6 @@ public: virtual std::string kindOf() const; virtual void visit(ParserVisitor*, bool); - protected: DataMember(const ContainerPtr&, const std::string&, const TypePtr&, bool, int, const SyntaxTreeBasePtr&, diff --git a/cpp/src/Slice/PythonUtil.cpp b/cpp/src/Slice/PythonUtil.cpp index 92560601189..188a5617c0c 100644 --- a/cpp/src/Slice/PythonUtil.cpp +++ b/cpp/src/Slice/PythonUtil.cpp @@ -897,7 +897,6 @@ Slice::Python::CodeVisitor::visitClassDefStart(const ClassDefPtr& p) _out << nl << "return _M_" << prxAbs << ".ice_uncheckedCast(proxy, facet)"; _out.dec(); - // // ice_staticId // @@ -1041,7 +1040,6 @@ Slice::Python::CodeVisitor::visitClassDefStart(const ClassDefPtr& p) _out << "))"; _out << nl << className << "._ice_type = _M_" << classType; - // // Define each operation. The arguments to the IcePy.Operation constructor are: // diff --git a/cpp/src/Slice/RubyUtil.cpp b/cpp/src/Slice/RubyUtil.cpp index 28ef26a0987..b66335fcc7e 100644 --- a/cpp/src/Slice/RubyUtil.cpp +++ b/cpp/src/Slice/RubyUtil.cpp @@ -19,7 +19,6 @@ using namespace Slice; using namespace IceUtil; using namespace IceUtilInternal; - namespace { @@ -238,7 +237,6 @@ Slice::Ruby::CodeVisitor::visitClassDefStart(const ClassDefPtr& p) bool isLocal = p->isLocal(); bool isAbstract = isInterface || p->allOperations().size() > 0; // Don't use isAbstract() - see bug 3739 - // // Do not generate any code for local interfaces. // @@ -466,7 +464,6 @@ Slice::Ruby::CodeVisitor::visitClassDefStart(const ClassDefPtr& p) const bool preserved = p->hasMetaData("preserve-slice") || p->inheritsMetaData("preserve-slice"); - _out << sp << nl << "T_" << name << ".defineClass(" << (isInterface ? "::Ice::Value" : name) << ", " << p->compactId() << ", " @@ -516,7 +513,6 @@ Slice::Ruby::CodeVisitor::visitClassDefStart(const ClassDefPtr& p) } _out << "])"; - // // Define each operation. The arguments to __defineOperation are: // diff --git a/cpp/src/Slice/Util.h b/cpp/src/Slice/Util.h index a3d22074911..a31536a6ed8 100644 --- a/cpp/src/Slice/Util.h +++ b/cpp/src/Slice/Util.h @@ -31,7 +31,6 @@ std::vector<std::string> argvToArgs(int argc, wchar_t* argv[]); std::vector<std::string> argvToArgs(int argc, char* argv[]); #endif - enum EscapeMode { UCN, Octal, ShortUCN, EC6UCN }; // Parameters: @@ -47,7 +46,6 @@ enum EscapeMode { UCN, Octal, ShortUCN, EC6UCN }; std::string toStringLiteral(const std::string&, const std::string&, const std::string&, EscapeMode, unsigned char); - void writeDependencies(const std::string&, const std::string&); diff --git a/cpp/src/icegriddb/IceGridDB.cpp b/cpp/src/icegriddb/IceGridDB.cpp index 6431f1667b6..a5bacbc3234 100644 --- a/cpp/src/icegriddb/IceGridDB.cpp +++ b/cpp/src/icegriddb/IceGridDB.cpp @@ -99,7 +99,6 @@ private: } - // // This custom version of the StreamReader allows us to customize the // reading of ReplicaGroupDescriptor @@ -125,7 +124,6 @@ struct StreamReader<IceGrid::ReplicaGroupDescriptor, Ice::InputStream> }; } - class Client : public Ice::Application { public: diff --git a/cpp/src/slice2confluence/ConfluenceOutput.cpp b/cpp/src/slice2confluence/ConfluenceOutput.cpp index b464f8a9fcd..e603b5ef73c 100644 --- a/cpp/src/slice2confluence/ConfluenceOutput.cpp +++ b/cpp/src/slice2confluence/ConfluenceOutput.cpp @@ -392,7 +392,6 @@ Confluence::ConfluenceOutput::convertCommentHTML(string comment) comment.replace(tagStart, tagEnd + 1 - tagStart, replacement); // Don't skip whitespace } - // Special case: terminate <p> (and any italics) on double newline or end of comment size_t dnl = comment.find("\n\n", tagStart + replacement.size()); tagStart = comment.find("<"); @@ -458,7 +457,6 @@ Confluence::ConfluenceOutput::startElement(const string& element) string::size_type tagpos = element.find_first_of(" "); const string tagname = element.substr(0, tagpos).c_str(); - if(tagname == "p") { _out << "\n"; diff --git a/cpp/src/slice2confluence/ConfluenceOutput.h b/cpp/src/slice2confluence/ConfluenceOutput.h index 10761537bf0..2848937ebbe 100644 --- a/cpp/src/slice2confluence/ConfluenceOutput.h +++ b/cpp/src/slice2confluence/ConfluenceOutput.h @@ -13,7 +13,6 @@ #include <IceUtil/OutputUtil.h> #include <list> - namespace Confluence { diff --git a/cpp/src/slice2confluence/Gen.cpp b/cpp/src/slice2confluence/Gen.cpp index 064236b0c61..ef17947e9f5 100644 --- a/cpp/src/slice2confluence/Gen.cpp +++ b/cpp/src/slice2confluence/Gen.cpp @@ -94,7 +94,6 @@ generate(const UnitPtr& unit, const string& dir, const string& header, const str } - string Slice::GeneratorBase::_dir = "."; string Slice::GeneratorBase::_header1; string Slice::GeneratorBase::_header2; @@ -200,7 +199,6 @@ Slice::GeneratorBase::setSymbols(const ContainedList& symbols) _symbols = symbols; } - void Slice::GeneratorBase::setSortOrder(const vector<string>& sortOrder) { @@ -431,7 +429,6 @@ Slice::GeneratorBase::trim(string str) return out; } - string Slice::GeneratorBase::getUpper(const std::string& str) { @@ -814,7 +811,6 @@ compareContained(const ContainedPtr& p1, const ContainedPtr& p2) //XXX --- END HACK } - if (!c1 && !c2) { // Both are top-level containers, compare cnames @@ -850,7 +846,6 @@ compareContained(const ContainedPtr& p1, const ContainedPtr& p2) if ("Instrumentation" == p1->name() || "Instrumentation" == p2->name()) { } - if (p1->name() == c2->name()) { // Module index comes before its own contents @@ -1528,7 +1523,6 @@ Slice::GeneratorBase::isTagged(const string& tag, string& comment) return false; } - string Slice::GeneratorBase::getScopedMinimized(const ContainedPtr& contained, const ContainerPtr& container, bool shortName) { @@ -1547,7 +1541,6 @@ Slice::GeneratorBase::getScopedMinimized(const ContainedPtr& contained, const Co return s.substr(2); } - // do // { // string s2 = q->scoped(); // Containing scope @@ -2074,7 +2067,6 @@ TOCGenerator::symbols() const return _symbols; } - void TOCGenerator::writeEntry(const ContainedPtr& c) { @@ -3254,7 +3246,6 @@ Slice::EnumGenerator::generate(const EnumPtr& e) _out << "\n{ztop}\n"; } - closeDoc(); start("hr"); diff --git a/cpp/src/slice2confluence/Gen.h b/cpp/src/slice2confluence/Gen.h index a33e6fe834e..10f4e0a62e3 100644 --- a/cpp/src/slice2confluence/Gen.h +++ b/cpp/src/slice2confluence/Gen.h @@ -144,8 +144,6 @@ class StartPageGenerator : private GeneratorBase { public: - - StartPageGenerator(const Files&); ~StartPageGenerator(); void generate(const ModulePtr&); @@ -155,7 +153,6 @@ private: using GeneratorBase::printHeaderFooter; void printHeaderFooter(); - typedef ::std::vector<StringPair> ModuleDescriptions; ModuleDescriptions _modules; Confluence::ConfluenceOutput _out; diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp index 6b4e25ecba6..990ddd57d47 100644 --- a/cpp/src/slice2cpp/Gen.cpp +++ b/cpp/src/slice2cpp/Gen.cpp @@ -79,7 +79,6 @@ isConstexprType(const TypePtr& type) } } - string getDeprecateSymbol(const ContainedPtr& p1, const ContainedPtr& p2) { @@ -572,7 +571,6 @@ Slice::Gen::generate(const UnitPtr& p) printHeader(C); printGeneratedHeader(C, _base + ".ice"); - string s = _base + "." + _headerExtension;; if(_include.size()) { @@ -1879,7 +1877,6 @@ Slice::Gen::ProxyVisitor::visitOperation(const OperationPtr& p) ParamDeclList inParams; ParamDeclList outParams; - vector<string> outEndArgs; for(ParamDeclList::const_iterator q = paramList.begin(); q != paramList.end(); ++q) @@ -4858,7 +4855,6 @@ Slice::Gen::MetaDataVisitor::validate(const SyntaxTreeBasePtr& cont, const Strin return newMetaData; } - void Slice::Gen::normalizeMetaData(const UnitPtr& u, bool cpp11) { @@ -4973,7 +4969,6 @@ Slice::Gen::NormalizeMetaDataVisitor::visitConst(const ConstPtr& p) p->setMetaData(normalize(p->getMetaData())); } - StringList Slice::Gen::NormalizeMetaDataVisitor::normalize(const StringList& metaData) { @@ -5521,7 +5516,6 @@ Slice::Gen::Cpp11TypesVisitor::visitExceptionStart(const ExceptionPtr& p) H << sp; H << nl << _dllMemberExport << "static const ::std::string& ice_staticId();"; - C << sp << nl << "const ::std::string&" << nl << scoped.substr(2) << "::ice_staticId()"; C << sb; // @@ -5999,7 +5993,6 @@ Slice::Gen::Cpp11ProxyVisitor::visitOperation(const OperationPtr& p) H << "context" << epar << ";"; H << eb; - // // Lambda based asynchronous operation // @@ -6677,7 +6670,6 @@ Slice::Gen::Cpp11LocalObjectVisitor::visitOperation(const OperationPtr& p) string deprecateSymbol = getDeprecateSymbol(p, cl); - if(cl->hasMetaData("async-oneway") || p->hasMetaData("async-oneway")) { vector<string> paramsDeclAMI; @@ -7681,7 +7673,6 @@ Slice::Gen::Cpp11StreamVisitor::visitEnum(const EnumPtr& p) } } - Slice::Gen::Cpp11CompatibilityVisitor::Cpp11CompatibilityVisitor(Output& h, Output&, const string& dllExport) : H(h), _dllExport(dllExport) diff --git a/cpp/src/slice2cpp/Gen.h b/cpp/src/slice2cpp/Gen.h index dd05ae03897..139f9ecd8c3 100644 --- a/cpp/src/slice2cpp/Gen.h +++ b/cpp/src/slice2cpp/Gen.h @@ -45,7 +45,6 @@ private: void writeExtraHeaders(::IceUtilInternal::Output&); - // // Returns the header extension defined in the global metadata for a given file, // or an empty string if no global metadata was found. @@ -433,7 +432,6 @@ private: std::list<int> _useWstringHist; }; - class Cpp11ObjectVisitor : public ParserVisitor { public: @@ -524,7 +522,6 @@ private: std::string _dllExport; }; - class Cpp11CompatibilityVisitor : private ::IceUtil::noncopyable, public ParserVisitor { public: diff --git a/cpp/src/slice2cs/CsUtil.cpp b/cpp/src/slice2cs/CsUtil.cpp index 87cda0a1d6c..e546f183172 100644 --- a/cpp/src/slice2cs/CsUtil.cpp +++ b/cpp/src/slice2cs/CsUtil.cpp @@ -2463,7 +2463,6 @@ Slice::CsGenerator::MetaDataVisitor::validate(const ContainedPtr& cont) s.replace(0, clrPrefix.size(), csPrefix); } - if(s.find(csPrefix) == 0) { SequencePtr seq = SequencePtr::dynamicCast(cont); diff --git a/cpp/src/slice2cs/Gen.cpp b/cpp/src/slice2cs/Gen.cpp index 627bf2cdcbe..103b12565b1 100644 --- a/cpp/src/slice2cs/Gen.cpp +++ b/cpp/src/slice2cs/Gen.cpp @@ -1424,7 +1424,6 @@ Slice::CsVisitor::splitComment(const ContainedPtr& p, StringList& summaryLines, } } - void Slice::CsVisitor::writeDocComment(const ContainedPtr& p, const string& deprecateReason, const string& extraParam) { @@ -1713,7 +1712,6 @@ Slice::CsVisitor::writeDocCommentTaskAsyncAMI(const OperationPtr& p, const strin _out << nl << "/// " << extraParam3; } - _out << nl << "/// <returns>The task object representing the asynchronous operation.</returns>"; if(!deprecateReason.empty()) diff --git a/cpp/src/slice2cs/Gen.h b/cpp/src/slice2cs/Gen.h index f8f5bb5be13..35833ae19af 100644 --- a/cpp/src/slice2cs/Gen.h +++ b/cpp/src/slice2cs/Gen.h @@ -15,7 +15,6 @@ namespace Slice { - class CsVisitor : public CsGenerator, public ParserVisitor { public: diff --git a/cpp/src/slice2html/Gen.cpp b/cpp/src/slice2html/Gen.cpp index 4ce38794401..50a6f18553b 100644 --- a/cpp/src/slice2html/Gen.cpp +++ b/cpp/src/slice2html/Gen.cpp @@ -1941,7 +1941,6 @@ TOCGenerator::symbols() const return _symbols; } - void TOCGenerator::writeEntry(const ContainedPtr& c) { diff --git a/cpp/src/slice2java/Gen.cpp b/cpp/src/slice2java/Gen.cpp index 9c01a29816d..f5c1b430e67 100644 --- a/cpp/src/slice2java/Gen.cpp +++ b/cpp/src/slice2java/Gen.cpp @@ -113,7 +113,6 @@ bool isValue(const TypePtr& type) return (b && b->usesClasses()) || cl; } - // Returns java.util.OptionalXXX.ofYYY depending on the type string ofFactory(const TypePtr& type) { @@ -4306,7 +4305,6 @@ Slice::Gen::HelperVisitor::visitSequence(const SequencePtr& p) out << nl << "return v;"; out << eb; - static const char* builtinTable[] = { "Byte", "Bool", "Short", "Int", "Long", "Float", "Double", "String" }; string optTypeS = "java.util.Optional<" + typeS + ">"; diff --git a/cpp/src/slice2java/GenCompat.cpp b/cpp/src/slice2java/GenCompat.cpp index 28d724f8646..f23183de94c 100644 --- a/cpp/src/slice2java/GenCompat.cpp +++ b/cpp/src/slice2java/GenCompat.cpp @@ -102,7 +102,6 @@ getEscapedParamName(const DataMemberList& params, const string& name) return name; } - string getDeprecateReason(const ContainedPtr& p1, const ContainedPtr& p2, const string& type) { @@ -4349,7 +4348,6 @@ Slice::GenCompat::HolderVisitor::writeHolder(const TypePtr& p) string name = contained->name(); string absolute = getAbsolute(contained, "", "", "Holder"); - string file; if(p->definitionContext()) { diff --git a/cpp/src/slice2js/Gen.cpp b/cpp/src/slice2js/Gen.cpp index 90c473f405e..b3dbc7fd13a 100644 --- a/cpp/src/slice2js/Gen.cpp +++ b/cpp/src/slice2js/Gen.cpp @@ -359,7 +359,6 @@ Slice::Gen::Gen(const string& base, const vector<string>& includePaths, const st } FileTracker::instance()->addFile(file); - printHeader(); printGeneratedHeader(_out, _fileBase + ".ice"); } @@ -696,7 +695,6 @@ Slice::Gen::RequireVisitor::writeRequires(const UnitPtr& p) seenModules.push_back("Ice"); - for(StringList::const_iterator i = includes.begin(); i != includes.end(); ++i) { set<string> modules = p->getTopLevelModules(*i); @@ -1150,7 +1148,6 @@ Slice::Gen::TypesVisitor::visitClassDefStart(const ClassDefPtr& p) _out << nl << proxyType << " = class extends " << baseProxy; _out << sb; - if(!bases.empty()) { _out << sp; diff --git a/cpp/src/slice2objc/Gen.cpp b/cpp/src/slice2objc/Gen.cpp index 5e3da9416c7..9872a07388f 100644 --- a/cpp/src/slice2objc/Gen.cpp +++ b/cpp/src/slice2objc/Gen.cpp @@ -1787,7 +1787,6 @@ Slice::Gen::TypesVisitor::writeMemberSignature(const DataMemberList& dataMembers typeString = inTypeToString(type, (*q)->optional()); } - if(q != dataMembers.begin() || ct == LocalException) { _H << " " << getParamId(*q); @@ -2621,7 +2620,6 @@ Slice::Gen::HelperVisitor::visitDictionary(const DictionaryPtr& p) _M << nl << "@end"; } - bool Slice::Gen::HelperVisitor::visitStructStart(const StructPtr& p) { diff --git a/cpp/src/slice2objc/Gen.h b/cpp/src/slice2objc/Gen.h index 0dc596c2d4d..a3bd8b6c719 100644 --- a/cpp/src/slice2objc/Gen.h +++ b/cpp/src/slice2objc/Gen.h @@ -15,7 +15,6 @@ namespace Slice { - class ObjCVisitor : public ObjCGenerator, public ParserVisitor { public: diff --git a/cpp/src/slice2objc/ObjCUtil.h b/cpp/src/slice2objc/ObjCUtil.h index b711e9a17a6..31d8027dd0f 100644 --- a/cpp/src/slice2objc/ObjCUtil.h +++ b/cpp/src/slice2objc/ObjCUtil.h @@ -112,7 +112,6 @@ private: static const std::string _msg; // "ignoring invalid metadata" }; - // // Map of module scoped name to ModulePtr. Used to verify that objc:prefix metadata directives are consistent. // |