diff options
| author | Marc Laukien <marc@zeroc.com> | 2002-06-25 18:03:20 +0000 |
|---|---|---|
| committer | Marc Laukien <marc@zeroc.com> | 2002-06-25 18:03:20 +0000 |
| commit | 364c465628189a4f3dee6eac54ff48825c48e681 (patch) | |
| tree | a7d51101d0fdfef43601b48965c2935059e617b6 /cpp | |
| parent | comments (diff) | |
| download | ice-364c465628189a4f3dee6eac54ff48825c48e681.tar.bz2 ice-364c465628189a4f3dee6eac54ff48825c48e681.tar.xz ice-364c465628189a4f3dee6eac54ff48825c48e681.zip | |
removed spaces
Diffstat (limited to 'cpp')
37 files changed, 338 insertions, 338 deletions
diff --git a/cpp/demo/Freeze/library/Scanner.l b/cpp/demo/Freeze/library/Scanner.l index f481addc728..7ed4d6d9307 100644 --- a/cpp/demo/Freeze/library/Scanner.l +++ b/cpp/demo/Freeze/library/Scanner.l @@ -34,27 +34,27 @@ NL [\n] do { c = yyinput(); - if (c == '\n') + if(c == '\n') { parser->nextLine(); } } - while (c != '\n' && c != EOF); + while(c != '\n' && c != EOF); } "/*" { // C-style comment - while (true) + while(true) { int c = yyinput(); - if (c == '\n') + if(c == '\n') { parser->nextLine(); } - else if (c == '*') + else if(c == '*') { int next = yyinput(); - if (next == '/') + if(next == '/') { break; } @@ -63,7 +63,7 @@ NL [\n] unput(next); } } - else if (c == EOF) + else if(c == EOF) { parser->warning("EOF in comment"); break; @@ -121,13 +121,13 @@ NL [\n] {WS}*(\\{WS}*{NL})? { int len = strlen(yytext); - for (int i = 0; i < len; ++i) + for(int i = 0; i < len; ++i) { - if (yytext[i] == '\\') + if(yytext[i] == '\\') { parser->continueLine(); } - else if (yytext[i] == '\n') + else if(yytext[i] == '\n') { parser->nextLine(); } @@ -136,9 +136,9 @@ NL [\n] {NL}|; { int len = strlen(yytext); - for (int i = 0; i < len; ++i) + for(int i = 0; i < len; ++i) { - if (yytext[i] == '\n') + if(yytext[i] == '\n') { parser->nextLine(); } @@ -149,27 +149,27 @@ NL [\n] \" { // "..."-type strings string s; - while (true) + while(true) { char c = static_cast<char>(yyinput()); - if (c == '"') + if(c == '"') { break; } - else if (c == EOF) + else if(c == EOF) { parser->warning("EOF in string"); break; } - else if (c == '\n') + else if(c == '\n') { s += c; parser->nextLine(); } - else if (c == '\\') + else if(c == '\\') { char next = static_cast<char>(yyinput()); - switch (next) + switch(next) { case '\\': case '"': @@ -228,19 +228,19 @@ NL [\n] \' { // '...'-type strings string s; - while (true) + while(true) { char c = static_cast<char>(yyinput()); - if (c == '\'') + if(c == '\'') { break; } - else if (c == EOF) + else if(c == EOF) { parser->warning("EOF in string"); break; } - else if (c == '\n') + else if(c == '\n') { s += c; parser->nextLine(); @@ -259,14 +259,14 @@ NL [\n] // Simple strings string s; s += yytext[0]; - while (true) + while(true) { char c = static_cast<char>(yyinput()); - if (c == EOF) + if(c == EOF) { break; } - else if (isspace(c) || c == ';') + else if(isspace(c) || c == ';') { unput(c); break; diff --git a/cpp/demo/Freeze/phonebook/Scanner.l b/cpp/demo/Freeze/phonebook/Scanner.l index 4607d2a5a95..2b35b34f16c 100644 --- a/cpp/demo/Freeze/phonebook/Scanner.l +++ b/cpp/demo/Freeze/phonebook/Scanner.l @@ -34,27 +34,27 @@ NL [\n] do { c = yyinput(); - if (c == '\n') + if(c == '\n') { parser->nextLine(); } } - while (c != '\n' && c != EOF); + while(c != '\n' && c != EOF); } "/*" { // C-style comment - while (true) + while(true) { int c = yyinput(); - if (c == '\n') + if(c == '\n') { parser->nextLine(); } - else if (c == '*') + else if(c == '*') { int next = yyinput(); - if (next == '/') + if(next == '/') { break; } @@ -63,7 +63,7 @@ NL [\n] unput(next); } } - else if (c == EOF) + else if(c == EOF) { parser->warning("EOF in comment"); break; @@ -121,13 +121,13 @@ NL [\n] {WS}*(\\{WS}*{NL})? { int len = strlen(yytext); - for (int i = 0; i < len; ++i) + for(int i = 0; i < len; ++i) { - if (yytext[i] == '\\') + if(yytext[i] == '\\') { parser->continueLine(); } - else if (yytext[i] == '\n') + else if(yytext[i] == '\n') { parser->nextLine(); } @@ -136,9 +136,9 @@ NL [\n] {NL}|; { int len = strlen(yytext); - for (int i = 0; i < len; ++i) + for(int i = 0; i < len; ++i) { - if (yytext[i] == '\n') + if(yytext[i] == '\n') { parser->nextLine(); } @@ -149,27 +149,27 @@ NL [\n] \" { // "..."-type strings string s; - while (true) + while(true) { char c = static_cast<char>(yyinput()); - if (c == '"') + if(c == '"') { break; } - else if (c == EOF) + else if(c == EOF) { parser->warning("EOF in string"); break; } - else if (c == '\n') + else if(c == '\n') { s += c; parser->nextLine(); } - else if (c == '\\') + else if(c == '\\') { char next = static_cast<char>(yyinput()); - switch (next) + switch(next) { case '\\': case '"': @@ -228,19 +228,19 @@ NL [\n] \' { // '...'-type strings string s; - while (true) + while(true) { char c = static_cast<char>(yyinput()); - if (c == '\'') + if(c == '\'') { break; } - else if (c == EOF) + else if(c == EOF) { parser->warning("EOF in string"); break; } - else if (c == '\n') + else if(c == '\n') { s += c; parser->nextLine(); @@ -259,14 +259,14 @@ NL [\n] // Simple strings string s; s += yytext[0]; - while (true) + while(true) { char c = static_cast<char>(yyinput()); - if (c == EOF) + if(c == EOF) { break; } - else if (isspace(c) || c == ';') + else if(isspace(c) || c == ';') { unput(c); break; diff --git a/cpp/demo/Glacier/session/Client.cpp b/cpp/demo/Glacier/session/Client.cpp index e45edb20196..cdd818bd613 100644 --- a/cpp/demo/Glacier/session/Client.cpp +++ b/cpp/demo/Glacier/session/Client.cpp @@ -72,12 +72,12 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) { router = starter->startRouter(id, pw, privateKey, publicKey, routerCert); } - catch (const Glacier::CannotStartRouterException& ex) + catch(const Glacier::CannotStartRouterException& ex) { cerr << argv[0] << ": " << ex << ":\n" << ex.reason << endl; return EXIT_FAILURE; } - catch (const Glacier::InvalidPasswordException&) + catch(const Glacier::InvalidPasswordException&) { cout << "password is invalid, try again" << endl; continue; diff --git a/cpp/src/Glacier/Blobject.cpp b/cpp/src/Glacier/Blobject.cpp index 413a5088af4..37aed350eba 100644 --- a/cpp/src/Glacier/Blobject.cpp +++ b/cpp/src/Glacier/Blobject.cpp @@ -87,7 +87,7 @@ Glacier::Blobject::invoke(ObjectPrx& proxy, const vector<Byte>& inParams, vector } } } - catch (const Exception& ex) + catch(const Exception& ex) { if(_traceLevel >= 1) { diff --git a/cpp/src/Glacier/Missive.cpp b/cpp/src/Glacier/Missive.cpp index bdc46f1ec2f..be8493cf29e 100644 --- a/cpp/src/Glacier/Missive.cpp +++ b/cpp/src/Glacier/Missive.cpp @@ -167,7 +167,7 @@ Glacier::MissiveQueue::run() (*p)->invoke(); proxies.push_back(proxy); } - catch (const Ice::Exception& ex) + catch(const Ice::Exception& ex) { if(_traceLevel >= 1) { @@ -211,7 +211,7 @@ Glacier::MissiveQueue::run() IceUtil::ThreadControl::sleep(_sleepTime); } } - catch (const Ice::Exception& ex) + catch(const Ice::Exception& ex) { IceUtil::Monitor<IceUtil::Mutex>::Lock lock(*this); diff --git a/cpp/src/Ice/.depend b/cpp/src/Ice/.depend index b1f671da2d8..6fe23906c1e 100644 --- a/cpp/src/Ice/.depend +++ b/cpp/src/Ice/.depend @@ -59,6 +59,6 @@ TcpAcceptor.o: TcpAcceptor.cpp ../Ice/TcpAcceptor.h ../Ice/TransceiverF.h ../../ TcpTransceiver.o: TcpTransceiver.cpp ../Ice/TcpTransceiver.h ../../include/Ice/InstanceF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../Ice/TraceLevelsF.h ../../include/Ice/LoggerF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../Ice/Transceiver.h ../Ice/TransceiverF.h ../Ice/Instance.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/RecMutex.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../Ice/DefaultsAndOverridesF.h ../Ice/RouterInfoF.h ../Ice/ReferenceFactoryF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/ConnectionFactoryF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../Ice/EndpointFactoryManagerF.h ../../include/Ice/PluginF.h ../Ice/TraceLevels.h ../../include/Ice/LoggerUtil.h ../../include/Ice/Buffer.h ../Ice/Network.h ../../include/Ice/LocalException.h ../../include/Ice/Identity.h UdpTransceiver.o: UdpTransceiver.cpp ../Ice/UdpTransceiver.h ../../include/Ice/InstanceF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../Ice/TraceLevelsF.h ../../include/Ice/LoggerF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../Ice/Transceiver.h ../Ice/TransceiverF.h ../Ice/Instance.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/RecMutex.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../Ice/DefaultsAndOverridesF.h ../Ice/RouterInfoF.h ../Ice/ReferenceFactoryF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/ConnectionFactoryF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../Ice/EndpointFactoryManagerF.h ../../include/Ice/PluginF.h ../Ice/TraceLevels.h ../../include/Ice/LoggerUtil.h ../../include/Ice/Buffer.h ../Ice/Network.h ../../include/Ice/LocalException.h ../../include/Ice/Identity.h DynamicLibrary.o: DynamicLibrary.cpp ../../include/Ice/DynamicLibrary.h ../../include/Ice/DynamicLibraryF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/IceUtil/Shared.h -Plugin.o: Plugin.cpp ../../include/Ice/Plugin.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h -PluginManagerI.o: PluginManagerI.cpp ../Ice/PluginManagerI.h ../../include/Ice/Plugin.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/InstanceF.h ../../include/Ice/CommunicatorF.h ../../include/Ice/DynamicLibraryF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/DynamicLibrary.h ../../include/Ice/Properties.h ../Ice/Instance.h ../../include/IceUtil/RecMutex.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../Ice/DefaultsAndOverridesF.h ../Ice/RouterInfoF.h ../Ice/ReferenceFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/ConnectionFactoryF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../Ice/EndpointFactoryManagerF.h ../../include/Ice/PluginF.h ../../include/Ice/LoggerUtil.h ../../include/Ice/Initialize.h ../../include/Ice/LocalException.h +Plugin.o: Plugin.cpp ../../include/Ice/Plugin.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/LocalException.h ../../include/Ice/Identity.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Stream.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/BuiltinSequences.h +PluginManagerI.o: PluginManagerI.cpp ../Ice/PluginManagerI.h ../../include/Ice/Plugin.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/LocalException.h ../../include/Ice/Identity.h ../../include/Ice/InstanceF.h ../../include/Ice/CommunicatorF.h ../../include/Ice/DynamicLibraryF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/DynamicLibrary.h ../../include/Ice/Properties.h ../Ice/Instance.h ../../include/IceUtil/RecMutex.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../Ice/DefaultsAndOverridesF.h ../Ice/RouterInfoF.h ../Ice/ReferenceFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/ConnectionFactoryF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../Ice/EndpointFactoryManagerF.h ../../include/Ice/PluginF.h ../../include/Ice/LoggerUtil.h ../../include/Ice/Initialize.h ProtocolPluginFacade.o: ProtocolPluginFacade.cpp ../../include/Ice/ProtocolPluginFacade.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/Ice/ProtocolPluginFacadeF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/StreamF.h ../../include/Ice/EndpointFactoryF.h ../../include/Ice/InstanceF.h ../Ice/Instance.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/RecMutex.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../Ice/DefaultsAndOverridesF.h ../Ice/RouterInfoF.h ../Ice/ReferenceFactoryF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/ConnectionFactoryF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../Ice/EndpointFactoryManagerF.h ../../include/Ice/PluginF.h ../Ice/EndpointFactoryManager.h ../../include/Ice/EndpointF.h ../Ice/TraceLevels.h ../../include/Ice/Initialize.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/Ice/ConnectionF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../Ice/DefaultsAndOverrides.h diff --git a/cpp/src/Ice/BasicStream.cpp b/cpp/src/Ice/BasicStream.cpp index 123178503b6..3cd0fb7104c 100644 --- a/cpp/src/Ice/BasicStream.cpp +++ b/cpp/src/Ice/BasicStream.cpp @@ -918,7 +918,7 @@ IceInternal::BasicStream::throwException(const string* throwsBegin, const string { factory->createAndThrow(id); } - catch (UserException& ex) + catch(UserException& ex) { static const string userException("::Ice::UserException"); for(const string* p = ex.__getExceptionIds(); *p != userException != 0; ++p) diff --git a/cpp/src/Ice/Connection.cpp b/cpp/src/Ice/Connection.cpp index 60efc551c80..8fe9ea0036b 100644 --- a/cpp/src/Ice/Connection.cpp +++ b/cpp/src/Ice/Connection.cpp @@ -168,7 +168,7 @@ IceInternal::Connection::sendRequest(Outgoing* out, bool oneway, bool comp) _transceiver->write(*os, _endpoint->timeout()); } } - catch (const LocalException& ex) + catch(const LocalException& ex) { setState(StateClosed, ex); ex.ice_throw(); @@ -315,7 +315,7 @@ IceInternal::Connection::flushBatchRequest(bool comp) _batchStream.swap(dummy); assert(_batchStream.b.empty()); } - catch (const LocalException& ex) + catch(const LocalException& ex) { setState(StateClosed, ex); ex.ice_throw(); @@ -575,7 +575,7 @@ IceInternal::Connection::message(BasicStream& stream, const ThreadPoolPtr& threa } } } - catch (const LocalException& ex) + catch(const LocalException& ex) { setState(StateClosed, ex); return; @@ -619,7 +619,7 @@ IceInternal::Connection::message(BasicStream& stream, const ThreadPoolPtr& threa { in.invoke(response); } - catch (const LocalException& ex) + catch(const LocalException& ex) { IceUtil::RecMutex::Lock sync(*this); if(_warn) @@ -628,7 +628,7 @@ IceInternal::Connection::message(BasicStream& stream, const ThreadPoolPtr& threa out << "connection exception:\n" << ex << '\n' << _transceiver->toString(); } } - catch (const UserException& ex) + catch(const UserException& ex) { IceUtil::RecMutex::Lock sync(*this); if(_warn) @@ -649,7 +649,7 @@ IceInternal::Connection::message(BasicStream& stream, const ThreadPoolPtr& threa } while(batch && is->i < is->b.end()); } - catch (const LocalException& ex) + catch(const LocalException& ex) { IceUtil::RecMutex::Lock sync(*this); setState(StateClosed, ex); @@ -726,7 +726,7 @@ IceInternal::Connection::message(BasicStream& stream, const ThreadPoolPtr& threa closeConnection(); } } - catch (const LocalException& ex) + catch(const LocalException& ex) { setState(StateClosed, ex); return; @@ -951,7 +951,7 @@ IceInternal::Connection::setState(State state) { closeConnection(); } - catch (const LocalException& ex) + catch(const LocalException& ex) { setState(StateClosed, ex); } diff --git a/cpp/src/Ice/ConnectionFactory.cpp b/cpp/src/Ice/ConnectionFactory.cpp index b8ad2339a69..4cfe1b2f95f 100644 --- a/cpp/src/Ice/ConnectionFactory.cpp +++ b/cpp/src/Ice/ConnectionFactory.cpp @@ -116,15 +116,15 @@ IceInternal::OutgoingConnectionFactory::create(const vector<EndpointPtr>& endpoi _connections.insert(make_pair(endpoint, connection)); break; } - catch (const SocketException& ex) + catch(const SocketException& ex) { exception = auto_ptr<LocalException>(dynamic_cast<LocalException*>(ex.ice_clone())); } - catch (const DNSException& ex) + catch(const DNSException& ex) { exception = auto_ptr<LocalException>(dynamic_cast<LocalException*>(ex.ice_clone())); } - catch (const TimeoutException& ex) + catch(const TimeoutException& ex) { exception = auto_ptr<LocalException>(dynamic_cast<LocalException*>(ex.ice_clone())); } @@ -338,16 +338,16 @@ IceInternal::IncomingConnectionFactory::message(BasicStream&, const ThreadPoolPt connection->activate(); _connections.push_back(connection); } - catch (const SocketException&) + catch(const SocketException&) { // TODO: bandaid. Takes care of SSL Handshake problems during // creation of a Transceiver. Ignore, nothing we can do here. } - catch (const TimeoutException&) + catch(const TimeoutException&) { // Ignore timeouts. } - catch (const LocalException& ex) + catch(const LocalException& ex) { if(_warn) { @@ -385,13 +385,13 @@ IceInternal::IncomingConnectionFactory::finished(const ThreadPoolPtr& threadPool ConnectionPtr connection = new Connection(_instance, transceiver, _endpoint, _adapter); connection->destroy(Connection::ObjectAdapterDeactivated); } - catch (const TimeoutException&) + catch(const TimeoutException&) { break; // Exit loop on timeout. } } } - catch (const LocalException& ex) + catch(const LocalException& ex) { if(_warn) { diff --git a/cpp/src/Ice/Incoming.cpp b/cpp/src/Ice/Incoming.cpp index e75ed427c2b..59864d56feb 100644 --- a/cpp/src/Ice/Incoming.cpp +++ b/cpp/src/Ice/Incoming.cpp @@ -151,7 +151,7 @@ IceInternal::Incoming::invoke(bool response) } } } - catch (const LocationForward& ex) + catch(const LocationForward& ex) { if(locator && servant) { @@ -168,7 +168,7 @@ IceInternal::Incoming::invoke(bool response) _os.write(ex._prx); } } - catch (const ObjectNotExistException& ex) + catch(const ObjectNotExistException& ex) { if(locator && servant) { @@ -190,7 +190,7 @@ IceInternal::Incoming::invoke(bool response) // Rethrow, so that the caller can print a warning. ex.ice_throw(); } - catch (const FacetNotExistException& ex) + catch(const FacetNotExistException& ex) { if(locator && servant) { @@ -212,7 +212,7 @@ IceInternal::Incoming::invoke(bool response) // Rethrow, so that the caller can print a warning. ex.ice_throw(); } - catch (const OperationNotExistException& ex) + catch(const OperationNotExistException& ex) { if(locator && servant) { @@ -234,7 +234,7 @@ IceInternal::Incoming::invoke(bool response) // Rethrow, so that the caller can print a warning. ex.ice_throw(); } - catch (const LocalException& ex) + catch(const LocalException& ex) { if(locator && servant) { @@ -253,7 +253,7 @@ IceInternal::Incoming::invoke(bool response) // Rethrow, so that the caller can print a warning. ex.ice_throw(); } - catch (const UserException& ex) + catch(const UserException& ex) { if(locator && servant) { diff --git a/cpp/src/Ice/PluginManagerI.cpp b/cpp/src/Ice/PluginManagerI.cpp index c585dab36f1..c100901bf04 100644 --- a/cpp/src/Ice/PluginManagerI.cpp +++ b/cpp/src/Ice/PluginManagerI.cpp @@ -165,7 +165,7 @@ Ice::PluginManagerI::loadPlugin(const string& name, const string& entryPoint, co { info.plugin = factory(_instance->communicator(), name, args); } - catch (const Exception& ex) + catch(const Exception& ex) { // // Do NOT propagate the exception from the entry point, diff --git a/cpp/src/Ice/Proxy.cpp b/cpp/src/Ice/Proxy.cpp index 0adbf4d522e..cac00118bf5 100644 --- a/cpp/src/Ice/Proxy.cpp +++ b/cpp/src/Ice/Proxy.cpp @@ -66,7 +66,7 @@ IceInternal::checkedCast(const ObjectPrx& b, const string& f, ObjectPrx& d) #endif d = bb; } - catch (const FacetNotExistException&) + catch(const FacetNotExistException&) { } } @@ -117,15 +117,15 @@ IceProxy::Ice::Object::ice_isA(const string& __id, const Context& __context) Handle< ::IceDelegate::Ice::Object> __del = __getDelegate(); return __del->ice_isA(__id, __context); } - catch (const LocationForward& __ex) + catch(const LocationForward& __ex) { __locationForward(__ex); } - catch (const NonRepeatable& __ex) + catch(const NonRepeatable& __ex) { __handleException(*__ex.get(), __cnt); } - catch (const LocalException& __ex) + catch(const LocalException& __ex) { __handleException(__ex, __cnt); } @@ -144,15 +144,15 @@ IceProxy::Ice::Object::ice_ping(const Context& __context) __del->ice_ping(__context); return; } - catch (const LocationForward& __ex) + catch(const LocationForward& __ex) { __locationForward(__ex); } - catch (const NonRepeatable& __ex) + catch(const NonRepeatable& __ex) { __handleException(*__ex.get(), __cnt); } - catch (const LocalException& __ex) + catch(const LocalException& __ex) { __handleException(__ex, __cnt); } @@ -170,15 +170,15 @@ IceProxy::Ice::Object::ice_ids(const Context& __context) Handle< ::IceDelegate::Ice::Object> __del = __getDelegate(); return __del->ice_ids(__context); } - catch (const LocationForward& __ex) + catch(const LocationForward& __ex) { __locationForward(__ex); } - catch (const NonRepeatable& __ex) + catch(const NonRepeatable& __ex) { __handleException(*__ex.get(), __cnt); } - catch (const LocalException& __ex) + catch(const LocalException& __ex) { __handleException(__ex, __cnt); } @@ -196,15 +196,15 @@ IceProxy::Ice::Object::ice_id(const Context& __context) Handle< ::IceDelegate::Ice::Object> __del = __getDelegate(); return __del->ice_id(__context); } - catch (const LocationForward& __ex) + catch(const LocationForward& __ex) { __locationForward(__ex); } - catch (const NonRepeatable& __ex) + catch(const NonRepeatable& __ex) { __handleException(*__ex.get(), __cnt); } - catch (const LocalException& __ex) + catch(const LocalException& __ex) { __handleException(__ex, __cnt); } @@ -222,15 +222,15 @@ IceProxy::Ice::Object::ice_facets(const Context& __context) Handle< ::IceDelegate::Ice::Object> __del = __getDelegate(); return __del->ice_facets(__context); } - catch (const LocationForward& __ex) + catch(const LocationForward& __ex) { __locationForward(__ex); } - catch (const NonRepeatable& __ex) + catch(const NonRepeatable& __ex) { __handleException(*__ex.get(), __cnt); } - catch (const LocalException& __ex) + catch(const LocalException& __ex) { __handleException(__ex, __cnt); } @@ -252,11 +252,11 @@ IceProxy::Ice::Object::ice_invoke(const string& operation, Handle< ::IceDelegate::Ice::Object> __del = __getDelegate(); return __del->ice_invoke(operation, nonmutating, inParams, outParams, context); } - catch (const LocationForward& __ex) + catch(const LocationForward& __ex) { __locationForward(__ex); } - catch (const NonRepeatable& __ex) + catch(const NonRepeatable& __ex) { if(nonmutating) { @@ -267,7 +267,7 @@ IceProxy::Ice::Object::ice_invoke(const string& operation, __rethrowException(*__ex.get()); } } - catch (const LocalException& __ex) + catch(const LocalException& __ex) { __handleException(__ex, __cnt); } @@ -538,7 +538,7 @@ IceProxy::Ice::Object::__handleException(const LocalException& ex, int& cnt) { ex.ice_throw(); } - catch (const CloseConnectionException&) + catch(const CloseConnectionException&) { // // We always retry on a close connection exception, as this @@ -546,15 +546,15 @@ IceProxy::Ice::Object::__handleException(const LocalException& ex, int& cnt) // // TODO: configurable timeout before we try again? } - catch (const SocketException&) + catch(const SocketException&) { ++cnt; } - catch (const DNSException&) + catch(const DNSException&) { ++cnt; } - catch (const TimeoutException&) + catch(const TimeoutException&) { ++cnt; } @@ -967,11 +967,11 @@ IceDelegateD::Ice::Object::ice_isA(const string& __id, const Context& __context) { return __direct.facetServant()->ice_isA(__id, __current); } - catch (const LocalException&) + catch(const LocalException&) { throw UnknownLocalException(__FILE__, __LINE__); } - catch (const UserException&) + catch(const UserException&) { throw UnknownUserException(__FILE__, __LINE__); } @@ -995,11 +995,11 @@ IceDelegateD::Ice::Object::ice_ping(const ::Ice::Context& __context) __direct.facetServant()->ice_ping(__current); return; } - catch (const LocalException&) + catch(const LocalException&) { throw UnknownLocalException(__FILE__, __LINE__); } - catch (const UserException&) + catch(const UserException&) { throw UnknownUserException(__FILE__, __LINE__); } @@ -1022,11 +1022,11 @@ IceDelegateD::Ice::Object::ice_ids(const ::Ice::Context& __context) { return __direct.facetServant()->ice_ids(__current); } - catch (const LocalException&) + catch(const LocalException&) { throw UnknownLocalException(__FILE__, __LINE__); } - catch (const UserException&) + catch(const UserException&) { throw UnknownUserException(__FILE__, __LINE__); } @@ -1049,11 +1049,11 @@ IceDelegateD::Ice::Object::ice_id(const ::Ice::Context& __context) { return __direct.facetServant()->ice_id(__current); } - catch (const LocalException&) + catch(const LocalException&) { throw UnknownLocalException(__FILE__, __LINE__); } - catch (const UserException&) + catch(const UserException&) { throw UnknownUserException(__FILE__, __LINE__); } @@ -1076,11 +1076,11 @@ IceDelegateD::Ice::Object::ice_facets(const ::Ice::Context& __context) { return __direct.facetServant()->ice_facets(__current); } - catch (const LocalException&) + catch(const LocalException&) { throw UnknownLocalException(__FILE__, __LINE__); } - catch (const UserException&) + catch(const UserException&) { throw UnknownUserException(__FILE__, __LINE__); } @@ -1114,11 +1114,11 @@ IceDelegateD::Ice::Object::ice_invoke(const string& operation, { return __servant->ice_invoke(inParams, outParams, current); } - catch (const LocalException&) + catch(const LocalException&) { throw UnknownLocalException(__FILE__, __LINE__); } - catch (const UserException&) + catch(const UserException&) { throw UnknownUserException(__FILE__, __LINE__); } diff --git a/cpp/src/Ice/Reference.cpp b/cpp/src/Ice/Reference.cpp index 4174baad0be..80fd1237773 100644 --- a/cpp/src/Ice/Reference.cpp +++ b/cpp/src/Ice/Reference.cpp @@ -356,7 +356,7 @@ IceInternal::Reference::changeTimeout(int timeout) const newRouterInfo = instance->routerManager()->get(newRouter); newRouterInfo->setClientProxy(newClientProxy); } - catch (const NoEndpointException&) + catch(const NoEndpointException&) { // Ignore non-existing client proxies. } diff --git a/cpp/src/Ice/ThreadPool.cpp b/cpp/src/Ice/ThreadPool.cpp index dbcc65a2e6a..467bd0662ff 100644 --- a/cpp/src/Ice/ThreadPool.cpp +++ b/cpp/src/Ice/ThreadPool.cpp @@ -143,7 +143,7 @@ IceInternal::ThreadPool::ThreadPool(const InstancePtr& instance, bool server) : _threads.push_back(thread->start()); } } - catch (const IceUtil::Exception& ex) + catch(const IceUtil::Exception& ex) { { Error out(_instance->logger()); @@ -498,11 +498,11 @@ IceInternal::ThreadPool::run() { read(handler); } - catch (const TimeoutException&) // Expected. + catch(const TimeoutException&) // Expected. { goto repeatSelect; } - catch (const LocalException& ex) + catch(const LocalException& ex) { handler->exception(ex); goto repeatSelect; @@ -586,7 +586,7 @@ IceInternal::ThreadPool::EventHandlerThread::run() { _pool->run(); } - catch (const Exception& ex) + catch(const Exception& ex) { Error out(_pool->_instance->logger()); out << "exception in thread pool:\n" << ex; diff --git a/cpp/src/IceBox/Server.cpp b/cpp/src/IceBox/Server.cpp index 032964a3627..49108e7a502 100644 --- a/cpp/src/IceBox/Server.cpp +++ b/cpp/src/IceBox/Server.cpp @@ -66,7 +66,7 @@ main(int argc, char* argv[]) serviceManager = serviceManagerImpl; status = serviceManagerImpl->run(); } - catch (const Exception& ex) + catch(const Exception& ex) { cerr << ex << endl; status = EXIT_FAILURE; @@ -78,7 +78,7 @@ main(int argc, char* argv[]) { communicator->destroy(); } - catch (const Exception& ex) + catch(const Exception& ex) { cerr << ex << endl; status = EXIT_FAILURE; diff --git a/cpp/src/IceBox/ServiceManagerI.cpp b/cpp/src/IceBox/ServiceManagerI.cpp index 6139bbb81d0..64d467426ff 100644 --- a/cpp/src/IceBox/ServiceManagerI.cpp +++ b/cpp/src/IceBox/ServiceManagerI.cpp @@ -122,11 +122,11 @@ IceBox::ServiceManagerI::run() { r->second.service->start(); } - catch (const FailureException&) + catch(const FailureException&) { throw; } - catch (const Exception& ex) + catch(const Exception& ex) { FailureException e; e.reason = "ServiceManager: exception in start for service " + r->first + ": " + ex.ice_name(); @@ -164,14 +164,14 @@ IceBox::ServiceManagerI::run() // stopAll(); } - catch (const FailureException& ex) + catch(const FailureException& ex) { Error out(_logger); out << ex.reason; stopAll(); return EXIT_FAILURE; } - catch (const Exception& ex) + catch(const Exception& ex) { Error out(_logger); out << "ServiceManager: " << ex; @@ -251,7 +251,7 @@ IceBox::ServiceManagerI::init(const string& service, const string& entryPoint, c { info.service = factory(_communicator); } - catch (const Exception& ex) + catch(const Exception& ex) { FailureException e; e.reason = "ServiceManager: exception in entry point `" + entryPoint + "': " + ex.ice_name(); @@ -273,11 +273,11 @@ IceBox::ServiceManagerI::init(const string& service, const string& entryPoint, c info.library = library; _services[service] = info; } - catch (const FailureException&) + catch(const FailureException&) { throw; } - catch (const Exception& ex) + catch(const Exception& ex) { FailureException e; e.reason = "ServiceManager: exception while initializing service " + service + ": " + ex.ice_name(); @@ -299,7 +299,7 @@ IceBox::ServiceManagerI::stop(const string& service) { info.service->stop(); } - catch (const Exception& ex) + catch(const Exception& ex) { // // Release the service before the library @@ -329,7 +329,7 @@ IceBox::ServiceManagerI::stopAll() { stop((*r++).first); } - catch (const FailureException& ex) + catch(const FailureException& ex) { Error out(_logger); out << ex.reason; diff --git a/cpp/src/IcePack/Activator.cpp b/cpp/src/IcePack/Activator.cpp index 0e80a0eeeaf..9abc223b39e 100644 --- a/cpp/src/IcePack/Activator.cpp +++ b/cpp/src/IcePack/Activator.cpp @@ -57,7 +57,7 @@ IcePack::Activator::run() { terminationListener(); } - catch (const LocalException& ex) + catch(const LocalException& ex) { Error out(_communicator->getLogger()); out << "exception in process termination listener:\n" << ex; diff --git a/cpp/src/IcePack/Scanner.l b/cpp/src/IcePack/Scanner.l index 24f255d361b..d3df7768e8a 100644 --- a/cpp/src/IcePack/Scanner.l +++ b/cpp/src/IcePack/Scanner.l @@ -51,27 +51,27 @@ NL [\n] do { c = yyinput(); - if (c == '\n') + if(c == '\n') { parser->nextLine(); } } - while (c != '\n' && c != EOF); + while(c != '\n' && c != EOF); } "/*" { // C-style comment - while (true) + while(true) { int c = yyinput(); - if (c == '\n') + if(c == '\n') { parser->nextLine(); } - else if (c == '*') + else if(c == '*') { int next = yyinput(); - if (next == '/') + if(next == '/') { break; } @@ -80,7 +80,7 @@ NL [\n] unput(next); } } - else if (c == EOF) + else if(c == EOF) { parser->warning("EOF in comment"); break; @@ -114,13 +114,13 @@ NL [\n] {WS}*(\\{WS}*{NL})? { int len = strlen(yytext); - for (int i = 0; i < len; ++i) + for(int i = 0; i < len; ++i) { - if (yytext[i] == '\\') + if(yytext[i] == '\\') { parser->continueLine(); } - else if (yytext[i] == '\n') + else if(yytext[i] == '\n') { parser->nextLine(); } @@ -129,9 +129,9 @@ NL [\n] {NL}|; { int len = strlen(yytext); - for (int i = 0; i < len; ++i) + for(int i = 0; i < len; ++i) { - if (yytext[i] == '\n') + if(yytext[i] == '\n') { parser->nextLine(); } @@ -142,27 +142,27 @@ NL [\n] \" { // "..."-type strings string s; - while (true) + while(true) { char c = static_cast<char>(yyinput()); - if (c == '"') + if(c == '"') { break; } - else if (c == EOF) + else if(c == EOF) { parser->warning("EOF in string"); break; } - else if (c == '\n') + else if(c == '\n') { s += c; parser->nextLine(); } - else if (c == '\\') + else if(c == '\\') { char next = static_cast<char>(yyinput()); - switch (next) + switch(next) { case '\\': case '"': @@ -221,19 +221,19 @@ NL [\n] \' { // '...'-type strings string s; - while (true) + while(true) { char c = static_cast<char>(yyinput()); - if (c == '\'') + if(c == '\'') { break; } - else if (c == EOF) + else if(c == EOF) { parser->warning("EOF in string"); break; } - else if (c == '\n') + else if(c == '\n') { s += c; parser->nextLine(); @@ -252,14 +252,14 @@ NL [\n] // Simple strings string s; s += yytext[0]; - while (true) + while(true) { char c = static_cast<char>(yyinput()); - if (c == EOF) + if(c == EOF) { break; } - else if (isspace(c) || c == ';') + else if(isspace(c) || c == ';') { unput(c); break; diff --git a/cpp/src/IcePatch/Client.cpp b/cpp/src/IcePatch/Client.cpp index eef4467867f..c416bc8f966 100644 --- a/cpp/src/IcePatch/Client.cpp +++ b/cpp/src/IcePatch/Client.cpp @@ -131,12 +131,12 @@ IcePatch::Client::run(int argc, char* argv[]) { router = starter->startRouter(id, pw, privateKey, publicKey, routerCert); } - catch (const Glacier::CannotStartRouterException& ex) + catch(const Glacier::CannotStartRouterException& ex) { cerr << appName() << ": " << ex << ":\n" << ex.reason << endl; return EXIT_FAILURE; } - catch (const Glacier::InvalidPasswordException&) + catch(const Glacier::InvalidPasswordException&) { cout << "password is invalid, try again" << endl; } @@ -232,7 +232,7 @@ IcePatch::Client::run(int argc, char* argv[]) patch(topDesc->directory->getContents(), ""); } } - catch (const FileAccessException& ex) + catch(const FileAccessException& ex) { cout << endl; // There might still be a non-terminated line on cout. cerr << appName() << ": " << ex << ":\n" << ex.reason << endl; @@ -242,7 +242,7 @@ IcePatch::Client::run(int argc, char* argv[]) } return EXIT_FAILURE; } - catch (const BusyException&) + catch(const BusyException&) { cout << endl; // There might still be a non-terminated line on cout. cerr << appName() << ": patching service busy, try again later" << endl; diff --git a/cpp/src/IcePatch/FileLocator.cpp b/cpp/src/IcePatch/FileLocator.cpp index 140bb522fff..d8ad3fb02e2 100644 --- a/cpp/src/IcePatch/FileLocator.cpp +++ b/cpp/src/IcePatch/FileLocator.cpp @@ -60,7 +60,7 @@ IcePatch::FileLocator::locate(const ObjectAdapterPtr& adapter, const Current& cu { info = getFileInfo(path, true); } - catch (const FileAccessException& ex) + catch(const FileAccessException& ex) { Warning out(adapter->getCommunicator()->getLogger()); out << ex << ":\n" << ex.reason; diff --git a/cpp/src/IcePatch/IcePatchI.cpp b/cpp/src/IcePatch/IcePatchI.cpp index bdaa5a5b118..9dc64f5e8d6 100644 --- a/cpp/src/IcePatch/IcePatchI.cpp +++ b/cpp/src/IcePatch/IcePatchI.cpp @@ -87,7 +87,7 @@ IcePatch::DirectoryI::getContents(const Ice::Current& current) } } } - catch (const IceUtil::LockedException&) + catch(const IceUtil::LockedException&) { throw BusyException(); } @@ -105,7 +105,7 @@ IcePatch::DirectoryI::getContents(const Ice::Current& current) { result.push_back(file->describe()); } - catch (const ObjectNotExistException&) + catch(const ObjectNotExistException&) { // // Ignore. This can for example happen if the file @@ -152,7 +152,7 @@ IcePatch::RegularI::describe(const Ice::Current& current) desc->md5 = getMD5(path); return desc; } - catch (const IceUtil::LockedException&) + catch(const IceUtil::LockedException&) { throw BusyException(); } @@ -191,7 +191,7 @@ IcePatch::RegularI::getBZ2Size(const Ice::Current& current) return infoBZ2.size; } - catch (const IceUtil::LockedException&) + catch(const IceUtil::LockedException&) { throw BusyException(); } @@ -225,7 +225,7 @@ IcePatch::RegularI::getBZ2(Ice::Int pos, Ice::Int num, const Ice::Current& curre return IcePatch::getBZ2(path, pos, num); } - catch (const IceUtil::LockedException&) + catch(const IceUtil::LockedException&) { throw BusyException(); } @@ -259,7 +259,7 @@ IcePatch::RegularI::getBZ2MD5(Ice::Int size, const Ice::Current& current) return IcePatch::getPartialMD5(path + ".bz2", size); } - catch (const IceUtil::LockedException&) + catch(const IceUtil::LockedException&) { throw BusyException(); } diff --git a/cpp/src/IcePatch/Server.cpp b/cpp/src/IcePatch/Server.cpp index e8b14415ad8..55e441a4484 100644 --- a/cpp/src/IcePatch/Server.cpp +++ b/cpp/src/IcePatch/Server.cpp @@ -178,18 +178,18 @@ IcePatch::Updater::run() assert(topDesc); cleanup(topDesc->directory->getContents()); } - catch (const FileAccessException& ex) + catch(const FileAccessException& ex) { Error out(_adapter->getCommunicator()->getLogger()); out << "exception during update:\n" << ex << ":\n" << ex.reason; } - catch (const BusyException&) + catch(const BusyException&) { // // Just loop if we're busy. // } - catch (const ConnectFailedException&) + catch(const ConnectFailedException&) { // // This exception can be raised if the adapter is shutdown @@ -198,7 +198,7 @@ IcePatch::Updater::run() // break; } - catch (const Exception& ex) + catch(const Exception& ex) { Error out(_adapter->getCommunicator()->getLogger()); out << "exception during update:\n" << ex; diff --git a/cpp/src/IceSSL/ConfigParser.cpp b/cpp/src/IceSSL/ConfigParser.cpp index 9ce7ccbaf1f..befaa2f8dd5 100644 --- a/cpp/src/IceSSL/ConfigParser.cpp +++ b/cpp/src/IceSSL/ConfigParser.cpp @@ -121,7 +121,7 @@ IceSSL::ConfigParser::process() _root = parser.getDocument(); } } - catch (const XMLException& e) + catch(const XMLException& e) { ConfigParseException configEx(__FILE__, __LINE__); @@ -133,7 +133,7 @@ IceSSL::ConfigParser::process() throw configEx; } - catch (const DOM_DOMException& e) + catch(const DOM_DOMException& e) { ConfigParseException configEx(__FILE__, __LINE__); @@ -196,7 +196,7 @@ IceSSL::ConfigParser::loadClientConfig(GeneralConfig& general, return true; } } - catch (const DOM_DOMException& e) + catch(const DOM_DOMException& e) { ConfigParseException configEx(__FILE__, __LINE__); @@ -234,7 +234,7 @@ IceSSL::ConfigParser::loadServerConfig(GeneralConfig& general, return true; } } - catch (const DOM_DOMException& e) + catch(const DOM_DOMException& e) { ConfigParseException configEx(__FILE__, __LINE__); diff --git a/cpp/src/IceSSL/SslConnectionOpenSSL.cpp b/cpp/src/IceSSL/SslConnectionOpenSSL.cpp index 844568e4adb..bcc94efcd30 100644 --- a/cpp/src/IceSSL/SslConnectionOpenSSL.cpp +++ b/cpp/src/IceSSL/SslConnectionOpenSSL.cpp @@ -269,7 +269,7 @@ IceSSL::OpenSSL::Connection::verifyCertificate(int preVerifyOkay, X509_STORE_CTX { preVerifyOkay = verifier->verify(preVerifyOkay, x509StoreContext, _sslConnection); } - catch (const Ice::LocalException& localEx) + catch(const Ice::LocalException& localEx) { if(_traceLevels->security >= IceSSL::SECURITY_WARNINGS) { diff --git a/cpp/src/IceStorm/Scanner.l b/cpp/src/IceStorm/Scanner.l index bddcaf41b71..d85f6cb3543 100644 --- a/cpp/src/IceStorm/Scanner.l +++ b/cpp/src/IceStorm/Scanner.l @@ -51,27 +51,27 @@ NL [\n] do { c = yyinput(); - if (c == '\n') + if(c == '\n') { parser->nextLine(); } } - while (c != '\n' && c != EOF); + while(c != '\n' && c != EOF); } "/*" { // C-style comment - while (true) + while(true) { int c = yyinput(); - if (c == '\n') + if(c == '\n') { parser->nextLine(); } - else if (c == '*') + else if(c == '*') { int next = yyinput(); - if (next == '/') + if(next == '/') { break; } @@ -80,7 +80,7 @@ NL [\n] unput(next); } } - else if (c == EOF) + else if(c == EOF) { parser->warning("EOF in comment"); break; @@ -126,13 +126,13 @@ NL [\n] {WS}*(\\{WS}*{NL})? { int len = strlen(yytext); - for (int i = 0; i < len; ++i) + for(int i = 0; i < len; ++i) { - if (yytext[i] == '\\') + if(yytext[i] == '\\') { parser->continueLine(); } - else if (yytext[i] == '\n') + else if(yytext[i] == '\n') { parser->nextLine(); } @@ -141,9 +141,9 @@ NL [\n] {NL}|; { int len = strlen(yytext); - for (int i = 0; i < len; ++i) + for(int i = 0; i < len; ++i) { - if (yytext[i] == '\n') + if(yytext[i] == '\n') { parser->nextLine(); } @@ -154,27 +154,27 @@ NL [\n] \" { // "..."-type strings string s; - while (true) + while(true) { char c = static_cast<char>(yyinput()); - if (c == '"') + if(c == '"') { break; } - else if (c == EOF) + else if(c == EOF) { parser->warning("EOF in string"); break; } - else if (c == '\n') + else if(c == '\n') { s += c; parser->nextLine(); } - else if (c == '\\') + else if(c == '\\') { char next = static_cast<char>(yyinput()); - switch (next) + switch(next) { case '\\': case '"': @@ -233,19 +233,19 @@ NL [\n] \' { // '...'-type strings string s; - while (true) + while(true) { char c = static_cast<char>(yyinput()); - if (c == '\'') + if(c == '\'') { break; } - else if (c == EOF) + else if(c == EOF) { parser->warning("EOF in string"); break; } - else if (c == '\n') + else if(c == '\n') { s += c; parser->nextLine(); @@ -264,14 +264,14 @@ NL [\n] // Simple strings string s; s += yytext[0]; - while (true) + while(true) { char c = static_cast<char>(yyinput()); - if (c == EOF) + if(c == EOF) { break; } - else if (isspace(c) || c == ';') + else if(isspace(c) || c == ';') { unput(c); break; diff --git a/cpp/src/IceXML/StreamI.cpp b/cpp/src/IceXML/StreamI.cpp index 9848d14a7ab..f5fa98f537e 100644 --- a/cpp/src/IceXML/StreamI.cpp +++ b/cpp/src/IceXML/StreamI.cpp @@ -183,7 +183,7 @@ IceXML::StreamI::StreamI(const ::Ice::CommunicatorPtr& communicator, std::ostrea { XMLPlatformUtils::Initialize(); } - catch (const XMLException& ex) + catch(const XMLException& ex) { string err = "xerces: initialize failed: "; err += toString(ex.getMessage()); @@ -207,7 +207,7 @@ IceXML::StreamI::StreamI(const ::Ice::CommunicatorPtr& communicator, std::istrea { XMLPlatformUtils::Initialize(); } - catch (const XMLException& ex) + catch(const XMLException& ex) { string err = "xerces: initialize failed: "; err += toString(ex.getMessage()); @@ -265,14 +265,14 @@ IceXML::StreamI::StreamI(const ::Ice::CommunicatorPtr& communicator, std::istrea errorsOccured = true; } } - catch (const XMLException& ex) + catch(const XMLException& ex) { ostringstream os; os << "xerces: parsing error: " << toString(ex.getMessage()); logger->error(os.str()); errorsOccured = true; } - catch (const DOM_DOMException& ex) + catch(const DOM_DOMException& ex) { ostringstream os; os << "xerces: DOM parsing error: " << toString(ex.msg); diff --git a/cpp/src/Slice/Grammar.y b/cpp/src/Slice/Grammar.y index 841fc697dde..1385380afa9 100644 --- a/cpp/src/Slice/Grammar.y +++ b/cpp/src/Slice/Grammar.y @@ -120,7 +120,7 @@ definitions { StringListTokPtr metaData = StringListTokPtr::dynamicCast($1); ContainedPtr contained = ContainedPtr::dynamicCast($2); - if (contained && !metaData->v.empty()) + if(contained && !metaData->v.empty()) { contained->setMetaData(metaData->v); } @@ -267,7 +267,7 @@ exception_exports { StringListTokPtr metaData = StringListTokPtr::dynamicCast($1); ContainedPtr contained = ContainedPtr::dynamicCast($2); - if (contained && !metaData->v.empty()) + if(contained && !metaData->v.empty()) { contained->setMetaData(metaData->v); } @@ -331,7 +331,7 @@ struct_def // StructPtr st = StructPtr::dynamicCast($$); assert(st); - if (st->dataMembers().empty()) + if(st->dataMembers().empty()) { unit->error("structs must have at least one member"); } @@ -352,7 +352,7 @@ struct_exports { StringListTokPtr metaData = StringListTokPtr::dynamicCast($1); ContainedPtr contained = ContainedPtr::dynamicCast($2); - if (contained && !metaData->v.empty()) + if(contained && !metaData->v.empty()) { contained->setMetaData(metaData->v); } @@ -404,7 +404,7 @@ class_def ContainerPtr cont = unit->currentContainer(); ClassDefPtr base = ClassDefPtr::dynamicCast($3); ClassListTokPtr bases = ClassListTokPtr::dynamicCast($4); - if (base) + if(base) { bases->v.push_front(base); } @@ -492,7 +492,7 @@ class_exports { StringListTokPtr metaData = StringListTokPtr::dynamicCast($1); ContainedPtr contained = ContainedPtr::dynamicCast($2); - if (contained && !metaData->v.empty()) + if(contained && !metaData->v.empty()) { contained->setMetaData(metaData->v); } @@ -567,7 +567,7 @@ interface_def // ClassDefPtr cd = ClassDefPtr::dynamicCast($$); assert(cd); - if (cd->operations().empty()) + if(cd->operations().empty()) { unit->error("interfaces must have at least one operation"); } @@ -675,7 +675,7 @@ interface_exports { StringListTokPtr metaData = StringListTokPtr::dynamicCast($1); ContainedPtr contained = ContainedPtr::dynamicCast($2); - if (contained && !metaData->v.empty()) + if(contained && !metaData->v.empty()) { contained->setMetaData(metaData->v); } @@ -785,7 +785,7 @@ enum_def '{' enumerator_list '}' { EnumPtr en = EnumPtr::dynamicCast($3); - if (en) + if(en) { EnumeratorListTokPtr enumerators = EnumeratorListTokPtr::dynamicCast($5); en->setEnumerators(enumerators->v); @@ -825,7 +825,7 @@ enumerator EnumeratorListTokPtr ens = new EnumeratorListTok; ContainerPtr cont = unit->currentContainer(); EnumeratorPtr en = cont->createEnumerator(ident->v); - if (en) + if(en) { ens->v.push_front(en); } @@ -850,7 +850,7 @@ operation TypeStringListTokPtr outParms = TypeStringListTokPtr::dynamicCast($4); ExceptionListTokPtr throws = ExceptionListTokPtr::dynamicCast($6); ClassDefPtr cl = ClassDefPtr::dynamicCast(unit->currentContainer()); - if (cl) + if(cl) { $$ = cl->createOperation(name->v, returnType, inParms->v, outParms->v, throws->v); } @@ -979,17 +979,17 @@ data_member TypePtr type = TypePtr::dynamicCast($1); StringTokPtr ident = StringTokPtr::dynamicCast($2); ClassDefPtr cl = ClassDefPtr::dynamicCast(unit->currentContainer()); - if (cl) + if(cl) { $$ = cl->createDataMember(ident->v, type); } StructPtr st = StructPtr::dynamicCast(unit->currentContainer()); - if (st) + if(st) { $$ = st->createDataMember(ident->v, type); } ExceptionPtr ex = ExceptionPtr::dynamicCast(unit->currentContainer()); - if (ex) + if(ex) { $$ = ex->createDataMember(ident->v, type); } @@ -1079,7 +1079,7 @@ type StringTokPtr scoped = StringTokPtr::dynamicCast($1); ContainerPtr cont = unit->currentContainer(); TypeList types = cont->lookupType(scoped->v); - if (types.empty()) + if(types.empty()) { YYERROR; // Can't continue, jump to next yyerrok } @@ -1090,11 +1090,11 @@ type StringTokPtr scoped = StringTokPtr::dynamicCast($1); ContainerPtr cont = unit->currentContainer(); TypeList types = cont->lookupType(scoped->v); - if (types.empty()) + if(types.empty()) { YYERROR; // Can't continue, jump to next yyerrok } - for (TypeList::iterator p = types.begin(); p != types.end(); ++p) + for(TypeList::iterator p = types.begin(); p != types.end(); ++p) { ClassDeclPtr cl = ClassDeclPtr::dynamicCast(*p); if (!cl) diff --git a/cpp/src/Slice/Scanner.l b/cpp/src/Slice/Scanner.l index 584fcadb877..d54d6ea505e 100644 --- a/cpp/src/Slice/Scanner.l +++ b/cpp/src/Slice/Scanner.l @@ -45,29 +45,29 @@ using namespace Slice; do { c = yyinput(); - if (c == '\n') + if(c == '\n') { unit->nextLine(); } } - while (c != '\n' && c != EOF); + while(c != '\n' && c != EOF); } "/*" { // C-style comment string comment = yytext + 2; - while (true) + while(true) { int c = yyinput(); - if (c == '\n') + if(c == '\n') { comment += static_cast<char>(c); unit->nextLine(); } - else if (c == '*') + else if(c == '*') { int next = yyinput(); - if (next == '/') + if(next == '/') { break; } @@ -77,7 +77,7 @@ using namespace Slice; unput(next); } } - else if (c == EOF) + else if(c == EOF) { unit->warning("EOF in comment"); break; @@ -87,7 +87,7 @@ using namespace Slice; comment += static_cast<char>(c); } } - if (comment[0] == '*') + if(comment[0] == '*') { unit->setComment(comment); } @@ -383,27 +383,27 @@ using namespace Slice; \" { // "..."-type strings StringTokPtr str = new StringTok; - while (true) + while(true) { char c = static_cast<char>(yyinput()); - if (c == '"') + if(c == '"') { break; } - else if (c == EOF) + else if(c == EOF) { unit->warning("EOF in string"); break; } - else if (c == '\n') + else if(c == '\n') { str->v += c; unit->nextLine(); } - else if (c == '\\') + else if(c == '\\') { char next = static_cast<char>(yyinput()); - switch (next) + switch(next) { case '\\': case '"': @@ -461,19 +461,19 @@ using namespace Slice; \' { // '...'-type strings StringTokPtr str = new StringTok; - while (true) + while(true) { char c = static_cast<char>(yyinput()); - if (c == '\'') + if(c == '\'') { break; } - else if (c == EOF) + else if(c == EOF) { unit->warning("EOF in string"); break; } - else if (c == '\n') + else if(c == '\n') { str->v += c; unit->nextLine(); @@ -490,7 +490,7 @@ using namespace Slice; [[:space:]] { // Igore white-space - if (yytext[0] == '\n') + if(yytext[0] == '\n') { unit->nextLine(); } diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp index de127ea1e9c..4b3a7cea037 100644 --- a/cpp/src/slice2cpp/Gen.cpp +++ b/cpp/src/slice2cpp/Gen.cpp @@ -1209,11 +1209,11 @@ Slice::Gen::ProxyVisitor::visitOperation(const OperationPtr& p) C << nl << "return;"; } C << eb; - C << nl << "catch (const ::Ice::LocationForward& __ex)"; + C << nl << "catch(const ::Ice::LocationForward& __ex)"; C << sb; C << nl << "__locationForward(__ex);"; C << eb; - C << nl << "catch (const ::IceInternal::NonRepeatable& __ex)"; + C << nl << "catch(const ::IceInternal::NonRepeatable& __ex)"; C << sb; list<string> metaData = p->getMetaData(); bool nonmutating = find(metaData.begin(), metaData.end(), "nonmutating") != metaData.end(); @@ -1226,7 +1226,7 @@ Slice::Gen::ProxyVisitor::visitOperation(const OperationPtr& p) C << nl << "__rethrowException(*__ex.get());"; } C << eb; - C << nl << "catch (const ::Ice::LocalException& __ex)"; + C << nl << "catch(const ::Ice::LocalException& __ex)"; C << sb; C << nl << "__handleException(__ex, __cnt);"; C << eb; @@ -1732,16 +1732,16 @@ Slice::Gen::DelegateDVisitor::visitOperation(const OperationPtr& p) ExceptionList::const_iterator r; for(r = throws.begin(); r != throws.end(); ++r) { - C << nl << "catch (const " << (*r)->scoped() << "&)"; + C << nl << "catch(const " << (*r)->scoped() << "&)"; C << sb; C << nl << "throw;"; C << eb; } - C << nl << "catch (const ::Ice::LocalException&)"; + C << nl << "catch(const ::Ice::LocalException&)"; C << sb; C << nl << "throw ::Ice::UnknownLocalException(__FILE__, __LINE__);"; C << eb; - C << nl << "catch (const ::Ice::UserException&)"; + C << nl << "catch(const ::Ice::UserException&)"; C << sb; C << nl << "throw ::Ice::UnknownUserException(__FILE__, __LINE__);"; C << eb; @@ -2294,7 +2294,7 @@ Slice::Gen::ObjectVisitor::visitOperation(const OperationPtr& p) ExceptionList::const_iterator r; for(r = throws.begin(); r != throws.end(); ++r) { - C << nl << "catch (const " << (*r)->scoped() << "& __ex)"; + C << nl << "catch(const " << (*r)->scoped() << "& __ex)"; C << sb; C << nl << "__os->write(__ex);"; C << nl << "return ::IceInternal::DispatchUserException;"; @@ -2456,7 +2456,7 @@ Slice::Gen::IceInternalVisitor::visitClassDefStart(const ClassDefPtr& p) C << nl << "d->__copyFrom(bb);"; C << eb; C << eb; - C << nl << "catch (const ::Ice::FacetNotExistException&)"; + C << nl << "catch(const ::Ice::FacetNotExistException&)"; C << sb; C << eb; C << eb; diff --git a/cpp/src/slice2java/Gen.cpp b/cpp/src/slice2java/Gen.cpp index 452bc302622..25687404f8d 100644 --- a/cpp/src/slice2java/Gen.cpp +++ b/cpp/src/slice2java/Gen.cpp @@ -1475,7 +1475,7 @@ Slice::Gen::TypesVisitor::visitStructEnd(const StructPtr& p) out << sb; out << nl << "_r = (" << typeS << ")rhs;"; out << eb; - out << nl << "catch (ClassCastException ex)"; + out << nl << "catch(ClassCastException ex)"; out << sb; out << eb; out << sp << nl << "if(_r != null)"; @@ -1988,11 +1988,11 @@ Slice::Gen::HelperVisitor::visitClassDefStart(const ClassDefPtr& p) out << nl << "return;"; } out << eb; - out << nl << "catch (Ice.LocationForward __ex)"; + out << nl << "catch(Ice.LocationForward __ex)"; out << sb; out << nl << "__locationForward(__ex);"; out << eb; - out << nl << "catch (IceInternal.NonRepeatable __ex)"; + out << nl << "catch(IceInternal.NonRepeatable __ex)"; out << sb; list<string> metaData = op->getMetaData(); bool nonmutating = find(metaData.begin(), metaData.end(), "nonmutating") != metaData.end(); @@ -2005,7 +2005,7 @@ Slice::Gen::HelperVisitor::visitClassDefStart(const ClassDefPtr& p) out << nl << "__rethrowException(__ex.get());"; } out << eb; - out << nl << "catch (Ice.LocalException __ex)"; + out << nl << "catch(Ice.LocalException __ex)"; out << sb; out << nl << "__cnt = __handleException(__ex, __cnt);"; out << eb; @@ -2034,7 +2034,7 @@ Slice::Gen::HelperVisitor::visitClassDefStart(const ClassDefPtr& p) out << sb; out << nl << "result = (" << name << "Prx)p;"; out << eb; - out << nl << "catch (ClassCastException ex)"; + out << nl << "catch(ClassCastException ex)"; out << sb; out << nl << "if(p.ice_isA(\"" << scoped << "\"))"; out << sb; @@ -2056,7 +2056,7 @@ Slice::Gen::HelperVisitor::visitClassDefStart(const ClassDefPtr& p) out << nl << "result = h;"; out << eb; out << eb; - out << nl << "catch (Ice.FacetNotExistException ex)"; + out << nl << "catch(Ice.FacetNotExistException ex)"; out << sb; out << eb; out << eb; @@ -2086,7 +2086,7 @@ Slice::Gen::HelperVisitor::visitClassDefStart(const ClassDefPtr& p) out << sb; out << nl << "result = (" << name << "Prx)p;"; out << eb; - out << nl << "catch (ClassCastException ex)"; + out << nl << "catch(ClassCastException ex)"; out << sb; out << nl << name << "PrxHelper h = new " << name << "PrxHelper();"; out << nl << "h.__copyFrom(p);"; @@ -3008,7 +3008,7 @@ Slice::Gen::DelegateMVisitor::visitClassDefStart(const ClassDefPtr& p) out << nl << "throw __ex;"; out << eb; } - out << nl << "catch (Ice.UserException __ex)"; + out << nl << "catch(Ice.UserException __ex)"; out << sb; out << eb; } @@ -3126,7 +3126,7 @@ Slice::Gen::DelegateDVisitor::visitClassDefStart(const ClassDefPtr& p) out << sb; out << nl << "__servant = (" << name << ")__direct.facetServant();"; out << eb; - out << nl << "catch (ClassCastException __ex)"; + out << nl << "catch(ClassCastException __ex)"; out << sb; out << nl << "Ice.OperationNotExistException __opEx = new Ice.OperationNotExistException();"; out << nl << "__opEx.operation = __current.operation;"; @@ -3158,7 +3158,7 @@ Slice::Gen::DelegateDVisitor::visitClassDefStart(const ClassDefPtr& p) out << nl << "throw __ex;"; out << eb; } - out << nl << "catch (Ice.LocalException __ex)"; + out << nl << "catch(Ice.LocalException __ex)"; out << sb; out << nl << "Ice.UnknownLocalException __e = new Ice.UnknownLocalException();"; out << nl << "__e.initCause(__ex);"; @@ -3167,7 +3167,7 @@ Slice::Gen::DelegateDVisitor::visitClassDefStart(const ClassDefPtr& p) // // No need to catch UserException because it's not possible in Java // - out << nl << "catch (RuntimeException __ex)"; + out << nl << "catch(RuntimeException __ex)"; out << sb; out << nl << "Ice.UnknownException __e = new Ice.UnknownException();"; out << nl << "__e.initCause(__ex);"; diff --git a/cpp/src/slice2xsd/Validate.cpp b/cpp/src/slice2xsd/Validate.cpp index abc1c621a96..7f3e02c64b2 100644 --- a/cpp/src/slice2xsd/Validate.cpp +++ b/cpp/src/slice2xsd/Validate.cpp @@ -140,13 +140,13 @@ main(int argc, char** argv) errorsOccured = true; } - catch (const XMLException& e) + catch(const XMLException& e) { cerr << "An error occured during parsing\n Message: " << DOMString(e.getMessage()) << endl; errorsOccured = true; } - catch (const DOM_DOMException& e) + catch(const DOM_DOMException& e) { cerr << "A DOM error occured during parsing\n DOMException code: " << e.code << endl; diff --git a/cpp/test/Glacier/starter/Client.cpp b/cpp/test/Glacier/starter/Client.cpp index 9a29a4e0098..116e04a1f13 100644 --- a/cpp/test/Glacier/starter/Client.cpp +++ b/cpp/test/Glacier/starter/Client.cpp @@ -74,12 +74,12 @@ CallbackClient::run(int argc, char* argv[]) { router = starter->startRouter("dummy", "abc123", privateKey, publicKey, routerCert); } - catch (const Glacier::CannotStartRouterException& ex) + catch(const Glacier::CannotStartRouterException& ex) { cerr << appName() << ": " << ex << ":\n" << ex.reason << endl; return EXIT_FAILURE; } - catch (const Glacier::InvalidPasswordException& ex) + catch(const Glacier::InvalidPasswordException& ex) { cerr << appName() << ": " << ex << endl; return EXIT_FAILURE; @@ -167,7 +167,7 @@ CallbackClient::run(int argc, char* argv[]) twoway->initiateCallbackEx(twowayR, context); test(false); } - catch (const CallbackException& ex) + catch(const CallbackException& ex) { test(ex.someValue == 3.14); test(ex.someString == "3.14"); diff --git a/cpp/test/Ice/exceptions/AllTests.cpp b/cpp/test/Ice/exceptions/AllTests.cpp index 7392b96d25b..f892a69f620 100644 --- a/cpp/test/Ice/exceptions/AllTests.cpp +++ b/cpp/test/Ice/exceptions/AllTests.cpp @@ -67,7 +67,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) thrower->throwAasA(1); test(false); } - catch (const A& ex) + catch(const A& ex) { test(ex.a == 1); } @@ -81,7 +81,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) thrower->throwAorDasAorD(1); test(false); } - catch (const A& ex) + catch(const A& ex) { test(ex.a == 1); } @@ -95,7 +95,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) thrower->throwAorDasAorD(-1); test(false); } - catch (const D& ex) + catch(const D& ex) { test(ex.d == -1); } @@ -109,7 +109,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) thrower->throwBasB(1, 2); test(false); } - catch (const B& ex) + catch(const B& ex) { test(ex.a == 1); test(ex.b == 2); @@ -124,7 +124,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) thrower->throwCasC(1, 2, 3); test(false); } - catch (const C& ex) + catch(const C& ex) { test(ex.a == 1); test(ex.b == 2); @@ -144,7 +144,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) thrower->throwBasB(1, 2); test(false); } - catch (const A& ex) + catch(const A& ex) { test(ex.a == 1); } @@ -158,7 +158,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) thrower->throwCasC(1, 2, 3); test(false); } - catch (const B& ex) + catch(const B& ex) { test(ex.a == 1); test(ex.b == 2); @@ -179,7 +179,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) thrower->throwBasA(1, 2); test(false); } - catch (const Ice::NoUserExceptionFactoryException&) + catch(const Ice::NoUserExceptionFactoryException&) { } catch (...) @@ -192,7 +192,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) thrower->throwCasA(1, 2, 3); test(false); } - catch (const Ice::NoUserExceptionFactoryException&) + catch(const Ice::NoUserExceptionFactoryException&) { } catch (...) @@ -205,7 +205,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) thrower->throwCasB(1, 2, 3); test(false); } - catch (const Ice::NoUserExceptionFactoryException&) + catch(const Ice::NoUserExceptionFactoryException&) { } catch (...) @@ -233,7 +233,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) thrower->throwBasA(1, 2); test(false); } - catch (const B& ex) + catch(const B& ex) { test(ex.a == 1); test(ex.b == 2); @@ -248,7 +248,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) thrower->throwCasA(1, 2, 3); test(false); } - catch (const C& ex) + catch(const C& ex) { test(ex.a == 1); test(ex.b == 2); @@ -264,7 +264,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) thrower->throwCasB(1, 2, 3); test(false); } - catch (const C& ex) + catch(const C& ex) { test(ex.a == 1); test(ex.b == 2); @@ -286,10 +286,10 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) thrower->throwUndeclaredA(1); test(false); } - catch (const Ice::UnknownUserException&) + catch(const Ice::UnknownUserException&) { } - catch (const Ice::Exception& ex) + catch(const Ice::Exception& ex) { cout << ex << endl; test(false); @@ -304,7 +304,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) thrower->throwUndeclaredB(1, 2); test(false); } - catch (const Ice::UnknownUserException&) + catch(const Ice::UnknownUserException&) { } catch (...) @@ -317,7 +317,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) thrower->throwUndeclaredC(1, 2, 3); test(false); } - catch (const Ice::UnknownUserException&) + catch(const Ice::UnknownUserException&) { } catch (...) @@ -337,7 +337,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) thrower2->ice_ping(); test(false); } - catch (const Ice::ObjectNotExistException& ex) + catch(const Ice::ObjectNotExistException& ex) { test(ex.identity == id); } @@ -356,7 +356,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) thrower2->ice_ping(); test(false); } - catch (const Ice::FacetNotExistException& ex) + catch(const Ice::FacetNotExistException& ex) { test(ex.facet == "no such facet"); } @@ -375,7 +375,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) thrower2->noSuchOperation(); test(false); } - catch (const Ice::OperationNotExistException& ex) + catch(const Ice::OperationNotExistException& ex) { test(ex.operation == "noSuchOperation"); } @@ -393,7 +393,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) thrower->throwLocalException(); test(false); } - catch (const Ice::UnknownLocalException&) + catch(const Ice::UnknownLocalException&) { } catch (...) @@ -410,7 +410,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) thrower->throwNonIceException(); test(false); } - catch (const Ice::UnknownException&) + catch(const Ice::UnknownException&) { } catch (...) diff --git a/cpp/test/IceSSL/certificateAndKeyParsing/CertificateAndKeyParsing.cpp b/cpp/test/IceSSL/certificateAndKeyParsing/CertificateAndKeyParsing.cpp index 71db33dbfcb..6f7e8589664 100644 --- a/cpp/test/IceSSL/certificateAndKeyParsing/CertificateAndKeyParsing.cpp +++ b/cpp/test/IceSSL/certificateAndKeyParsing/CertificateAndKeyParsing.cpp @@ -31,13 +31,13 @@ testExpectCertificateAndPrivateKeyParseException(const IceSSL::PluginPtr& plugin plugin->setRSAKeysBase64(IceSSL::Client, key, cert); test(false); } - catch (const IceSSL::CertificateParseException&) + catch(const IceSSL::CertificateParseException&) { } - catch (const IceSSL::PrivateKeyParseException&) + catch(const IceSSL::PrivateKeyParseException&) { } - catch (const Ice::LocalException&) + catch(const Ice::LocalException&) { // // Any other exception is bad. @@ -67,13 +67,13 @@ testExpectCertificateAndPrivateKeyParseException(const IceSSL::PluginPtr& plugin plugin->setRSAKeys(IceSSL::Client, key, cert); test(false); } - catch (const IceSSL::CertificateParseException&) + catch(const IceSSL::CertificateParseException&) { } - catch (const IceSSL::PrivateKeyParseException&) + catch(const IceSSL::PrivateKeyParseException&) { } - catch (const Ice::LocalException&) + catch(const Ice::LocalException&) { // // Any other exception is bad. @@ -101,10 +101,10 @@ testExpectPrivateKeyParseException(const IceSSL::PluginPtr& plugin, const string plugin->setRSAKeysBase64(IceSSL::Client, key, cert); test(false); } - catch (const IceSSL::PrivateKeyParseException&) + catch(const IceSSL::PrivateKeyParseException&) { } - catch (const Ice::LocalException&) + catch(const Ice::LocalException&) { // // Any other exception is bad. @@ -132,10 +132,10 @@ testExpectPrivateKeyParseException(const IceSSL::PluginPtr& plugin, const Ice::B plugin->setRSAKeys(IceSSL::Client, key, cert); test(false); } - catch (const IceSSL::PrivateKeyParseException&) + catch(const IceSSL::PrivateKeyParseException&) { } - catch (const Ice::LocalException&) + catch(const Ice::LocalException&) { // // Any other exception is bad. @@ -163,10 +163,10 @@ testExpectCertificateParseException(const IceSSL::PluginPtr& plugin, const strin plugin->setRSAKeysBase64(IceSSL::Client, key, cert); test(false); } - catch (const IceSSL::CertificateParseException&) + catch(const IceSSL::CertificateParseException&) { } - catch (const Ice::LocalException&) + catch(const Ice::LocalException&) { // // Any other exception is bad. @@ -194,10 +194,10 @@ testExpectCertificateParseException(const IceSSL::PluginPtr& plugin, const Ice:: plugin->setRSAKeys(IceSSL::Client, key, cert); test(false); } - catch (const IceSSL::CertificateParseException&) + catch(const IceSSL::CertificateParseException&) { } - catch (const Ice::LocalException&) + catch(const Ice::LocalException&) { // // Any other exception is bad. @@ -225,10 +225,10 @@ testExpectCertificateParseException(const IceSSL::PluginPtr& plugin, const strin plugin->addTrustedCertificateBase64(IceSSL::Client, cert); test(false); } - catch (const IceSSL::CertificateParseException&) + catch(const IceSSL::CertificateParseException&) { } - catch (const Ice::LocalException&) + catch(const Ice::LocalException&) { // // Any other exception is bad. @@ -256,10 +256,10 @@ testExpectCertificateParseException(const IceSSL::PluginPtr& plugin, const Ice:: plugin->addTrustedCertificate(IceSSL::Client, cert); test(false); } - catch (const IceSSL::CertificateParseException&) + catch(const IceSSL::CertificateParseException&) { } - catch (const Ice::LocalException&) + catch(const Ice::LocalException&) { // // Any other exception is bad. @@ -289,10 +289,10 @@ testExpectContextNotConfiguredException(const IceSSL::PluginPtr& plugin, plugin->setRSAKeysBase64(IceSSL::Client, key, cert); test(false); } - catch (const IceSSL::OpenSSL::ContextNotConfiguredException&) + catch(const IceSSL::OpenSSL::ContextNotConfiguredException&) { } - catch (const Ice::LocalException&) + catch(const Ice::LocalException&) { // // Any other exception is bad. @@ -322,10 +322,10 @@ testExpectContextNotConfiguredException(const IceSSL::PluginPtr& plugin, plugin->setRSAKeys(IceSSL::Client, key, cert); test(false); } - catch (const IceSSL::OpenSSL::ContextNotConfiguredException&) + catch(const IceSSL::OpenSSL::ContextNotConfiguredException&) { } - catch (const Ice::LocalException&) + catch(const Ice::LocalException&) { // // Any other exception is bad. @@ -353,10 +353,10 @@ testExpectContextNotConfiguredException(const IceSSL::PluginPtr& plugin, const s plugin->addTrustedCertificateBase64(IceSSL::Client, cert); test(false); } - catch (const IceSSL::OpenSSL::ContextNotConfiguredException&) + catch(const IceSSL::OpenSSL::ContextNotConfiguredException&) { } - catch (const Ice::LocalException&) + catch(const Ice::LocalException&) { // // Any other exception is bad. @@ -384,10 +384,10 @@ testExpectContextNotConfiguredException(const IceSSL::PluginPtr& plugin, const I plugin->addTrustedCertificate(IceSSL::Client, cert); test(false); } - catch (const IceSSL::OpenSSL::ContextNotConfiguredException&) + catch(const IceSSL::OpenSSL::ContextNotConfiguredException&) { } - catch (const Ice::LocalException&) + catch(const Ice::LocalException&) { // // Any other exception is bad. @@ -417,10 +417,10 @@ testExpectCertificateKeyMatchException(const IceSSL::PluginPtr& plugin, plugin->setRSAKeysBase64(IceSSL::Client, key, cert); test(false); } - catch (const IceSSL::OpenSSL::CertificateKeyMatchException&) + catch(const IceSSL::OpenSSL::CertificateKeyMatchException&) { } - catch (const Ice::LocalException&) + catch(const Ice::LocalException&) { // // Any other exception is bad. @@ -450,10 +450,10 @@ testExpectCertificateKeyMatchException(const IceSSL::PluginPtr& plugin, plugin->setRSAKeys(IceSSL::Client, key, cert); test(false); } - catch (const IceSSL::OpenSSL::CertificateKeyMatchException&) + catch(const IceSSL::OpenSSL::CertificateKeyMatchException&) { } - catch (const Ice::LocalException&) + catch(const Ice::LocalException&) { // // Any other exception is bad. @@ -480,7 +480,7 @@ testNoException(const IceSSL::PluginPtr& plugin, const string& key, const string { plugin->setRSAKeysBase64(IceSSL::Client, key, cert); } - catch (const Ice::LocalException&) + catch(const Ice::LocalException&) { // // Any other exception is bad. @@ -507,7 +507,7 @@ testNoException(const IceSSL::PluginPtr& plugin, const Ice::ByteSeq& key, const { plugin->setRSAKeys(IceSSL::Client, key, cert); } - catch (const Ice::LocalException&) + catch(const Ice::LocalException&) { // // Any other exception is bad. @@ -534,7 +534,7 @@ testNoException(const IceSSL::PluginPtr& plugin, const string& cert) { plugin->addTrustedCertificateBase64(IceSSL::Client, cert); } - catch (const Ice::LocalException&) + catch(const Ice::LocalException&) { // // Any other exception is bad. @@ -561,7 +561,7 @@ testNoException(const IceSSL::PluginPtr& plugin, const Ice::ByteSeq& cert) { plugin->addTrustedCertificate(IceSSL::Client, cert); } - catch (const Ice::LocalException&) + catch(const Ice::LocalException&) { // // Any other exception is bad. diff --git a/cpp/test/IceSSL/certificateVerifier/CertificateVerifier.cpp b/cpp/test/IceSSL/certificateVerifier/CertificateVerifier.cpp index c52e67d6b67..ea9540479a5 100644 --- a/cpp/test/IceSSL/certificateVerifier/CertificateVerifier.cpp +++ b/cpp/test/IceSSL/certificateVerifier/CertificateVerifier.cpp @@ -53,11 +53,11 @@ testExpectCertificateVerifierTypeException(const IceSSL::PluginPtr& plugin, plugin->setCertificateVerifier(context, verifier); test(false); } - catch (const IceSSL::CertificateVerifierTypeException&) + catch(const IceSSL::CertificateVerifierTypeException&) { std::cout << "ok" << std::endl; } - catch (const Ice::LocalException&) + catch(const Ice::LocalException&) { // // Any other exception is bad. @@ -85,7 +85,7 @@ testExpectNoException(const IceSSL::PluginPtr& plugin, plugin->setCertificateVerifier(context, verifier); std::cout << "ok" << std::endl; } - catch (const Ice::LocalException&) + catch(const Ice::LocalException&) { // // Any other exception is bad. diff --git a/cpp/test/IceSSL/configuration/Configuration.cpp b/cpp/test/IceSSL/configuration/Configuration.cpp index f75d76a12e3..6b1cea2438a 100644 --- a/cpp/test/IceSSL/configuration/Configuration.cpp +++ b/cpp/test/IceSSL/configuration/Configuration.cpp @@ -102,7 +102,7 @@ testContextWithConfig(const Ice::CommunicatorPtr& communicator, std::cout << "ok" << std::endl; } } - catch (const IceSSL::ConfigurationLoadingException&) + catch(const IceSSL::ConfigurationLoadingException&) { // // Depending on the context type, and if we supplied @@ -151,7 +151,7 @@ testContextWithConfig(const Ice::CommunicatorPtr& communicator, } } } - catch (const LocalException&) + catch(const LocalException&) { // // Any other exception is bad. diff --git a/cpp/test/IceSSL/loadPEM/LoadPEM.cpp b/cpp/test/IceSSL/loadPEM/LoadPEM.cpp index 856bd4f17dd..4c51915ea7a 100644 --- a/cpp/test/IceSSL/loadPEM/LoadPEM.cpp +++ b/cpp/test/IceSSL/loadPEM/LoadPEM.cpp @@ -30,15 +30,15 @@ testExpectCertificateAndPrivateKeyLoadException(const Ice::CommunicatorPtr& comm sslPlugin->configure(IceSSL::Client); test(false); } - catch (const IceSSL::OpenSSL::CertificateLoadException&) + catch(const IceSSL::OpenSSL::CertificateLoadException&) { std::cout << "ok" << std::endl; } - catch (const IceSSL::OpenSSL::PrivateKeyLoadException&) + catch(const IceSSL::OpenSSL::PrivateKeyLoadException&) { std::cout << "ok" << std::endl; } - catch (const LocalException&) + catch(const LocalException&) { // // Any other exception is bad. @@ -69,11 +69,11 @@ testExpectPrivateKeyLoadException(const Ice::CommunicatorPtr& communicator, cons sslPlugin->configure(IceSSL::Client); test(false); } - catch (const IceSSL::OpenSSL::PrivateKeyLoadException&) + catch(const IceSSL::OpenSSL::PrivateKeyLoadException&) { std::cout << "ok" << std::endl; } - catch (const LocalException&) + catch(const LocalException&) { // // Any other exception is bad. @@ -104,11 +104,11 @@ testExpectCertificateLoadException(const Ice::CommunicatorPtr& communicator, con sslPlugin->configure(IceSSL::Client); test(false); } - catch (const IceSSL::OpenSSL::CertificateLoadException&) + catch(const IceSSL::OpenSSL::CertificateLoadException&) { std::cout << "ok" << std::endl; } - catch (const LocalException&) + catch(const LocalException&) { // // Any other exception is bad. @@ -139,11 +139,11 @@ testExpectCertificateKeyMatchException(const Ice::CommunicatorPtr& communicator, sslPlugin->configure(IceSSL::Client); test(false); } - catch (const IceSSL::OpenSSL::CertificateKeyMatchException&) + catch(const IceSSL::OpenSSL::CertificateKeyMatchException&) { std::cout << "ok" << std::endl; } - catch (const LocalException&) + catch(const LocalException&) { // // Any other exception is bad. @@ -174,7 +174,7 @@ testNoException(const Ice::CommunicatorPtr& communicator, const std::string& con sslPlugin->configure(IceSSL::Client); std::cout << "ok" << std::endl; } - catch (const LocalException&) + catch(const LocalException&) { // // Any other exception is bad. |