diff options
| author | Joe George <joe@zeroc.com> | 2017-05-09 16:39:18 -0400 |
|---|---|---|
| committer | Joe George <joe@zeroc.com> | 2017-05-09 16:39:56 -0400 |
| commit | a0dae9ed44e1f8ebd928389e612f4a502c05701a (patch) | |
| tree | ee40c6f9262601b387e17c90fccf9213564d3b7a /cpp | |
| parent | ICE-7868 - Update to latest gulp builder (diff) | |
| download | ice-a0dae9ed44e1f8ebd928389e612f4a502c05701a.tar.bz2 ice-a0dae9ed44e1f8ebd928389e612f4a502c05701a.tar.xz ice-a0dae9ed44e1f8ebd928389e612f4a502c05701a.zip | |
Cleanup more whitespace
Remove extra newlines from the end of files and add newlines to files
which are missing one.
Diffstat (limited to 'cpp')
169 files changed, 66 insertions, 175 deletions
diff --git a/cpp/allTests.py b/cpp/allTests.py index 18df973cab0..d0439bd0028 100755 --- a/cpp/allTests.py +++ b/cpp/allTests.py @@ -13,4 +13,4 @@ sys.path.append(os.path.join(os.path.dirname(__file__), "..", "scripts")) from Util import runTestsWithPath -runTestsWithPath(__file__)
\ No newline at end of file +runTestsWithPath(__file__) diff --git a/cpp/config/ice_ca.cnf b/cpp/config/ice_ca.cnf index 2477567c0dc..be731806232 100644 --- a/cpp/config/ice_ca.cnf +++ b/cpp/config/ice_ca.cnf @@ -50,4 +50,3 @@ basicConstraints = CA:true # PKIX recommendation. subjectKeyIdentifier = hash authorityKeyIdentifier = keyid:always,issuer:always - diff --git a/cpp/include/Glacier2/NullPermissionsVerifier.h b/cpp/include/Glacier2/NullPermissionsVerifier.h index 6007ff89e4b..f953777f8d9 100644 --- a/cpp/include/Glacier2/NullPermissionsVerifier.h +++ b/cpp/include/Glacier2/NullPermissionsVerifier.h @@ -34,4 +34,3 @@ setupNullPermissionsVerifier(const Ice::CommunicatorPtr&, const std::string&, co } #endif - diff --git a/cpp/include/IceUtil/Functional.h b/cpp/include/IceUtil/Functional.h index 2eed5550382..98ff097f53a 100644 --- a/cpp/include/IceUtil/Functional.h +++ b/cpp/include/IceUtil/Functional.h @@ -386,4 +386,3 @@ secondConstVoidMemFun1(void (T::*p)(A) const) } #endif - diff --git a/cpp/include/IceUtil/Thread.h b/cpp/include/IceUtil/Thread.h index 10989862fd6..66179fbd540 100644 --- a/cpp/include/IceUtil/Thread.h +++ b/cpp/include/IceUtil/Thread.h @@ -177,4 +177,3 @@ typedef Handle<Thread> ThreadPtr; } #endif - diff --git a/cpp/include/IceUtil/ThreadException.h b/cpp/include/IceUtil/ThreadException.h index 29c2abc7196..b90886aedab 100644 --- a/cpp/include/IceUtil/ThreadException.h +++ b/cpp/include/IceUtil/ThreadException.h @@ -97,4 +97,3 @@ private: } #endif - diff --git a/cpp/include/IceUtil/Timer.h b/cpp/include/IceUtil/Timer.h index ba409582ae1..bd5a946ee57 100644 --- a/cpp/include/IceUtil/Timer.h +++ b/cpp/include/IceUtil/Timer.h @@ -143,4 +143,3 @@ Timer::Token::operator<(const Timer::Token& r) const } #endif - diff --git a/cpp/msbuild/.gitignore b/cpp/msbuild/.gitignore index feef48dfc17..49954346309 100644 --- a/cpp/msbuild/.gitignore +++ b/cpp/msbuild/.gitignore @@ -9,4 +9,4 @@ zeroc.ice.uwp.arm zeroc.ice.uwp.x86 zeroc.ice.uwp.x64 zeroc.ice.java -zeroc.ice.html
\ No newline at end of file +zeroc.ice.html diff --git a/cpp/src/Glacier2/FilterManager.h b/cpp/src/Glacier2/FilterManager.h index f7afe95dc03..f76537a0fa2 100644 --- a/cpp/src/Glacier2/FilterManager.h +++ b/cpp/src/Glacier2/FilterManager.h @@ -86,4 +86,3 @@ private: }; #endif /* FILTER_MANAGER_H */ - diff --git a/cpp/src/Glacier2/RequestQueue.cpp b/cpp/src/Glacier2/RequestQueue.cpp index 6d1a4875850..ffd6f21861b 100644 --- a/cpp/src/Glacier2/RequestQueue.cpp +++ b/cpp/src/Glacier2/RequestQueue.cpp @@ -570,4 +570,3 @@ Glacier2::RequestQueueThread::run() } } } - diff --git a/cpp/src/Glacier2Lib/Glacier2.rc b/cpp/src/Glacier2Lib/Glacier2.rc index 450677e0604..e38e636ef09 100644 --- a/cpp/src/Glacier2Lib/Glacier2.rc +++ b/cpp/src/Glacier2Lib/Glacier2.rc @@ -31,4 +31,3 @@ BEGIN VALUE "Translation", 0x409, 1252 END END - diff --git a/cpp/src/Ice/ConnectionFactory.cpp b/cpp/src/Ice/ConnectionFactory.cpp index 0858c97a556..b8e6b03651b 100644 --- a/cpp/src/Ice/ConnectionFactory.cpp +++ b/cpp/src/Ice/ConnectionFactory.cpp @@ -1845,4 +1845,3 @@ IceInternal::IncomingConnectionFactory::closeAcceptor() _instance->timer()->schedule(ICE_MAKE_SHARED(StartAcceptor, ICE_SHARED_FROM_THIS), IceUtil::Time::seconds(1)); } } - diff --git a/cpp/src/Ice/FactoryTable.cpp b/cpp/src/Ice/FactoryTable.cpp index d14d55fe649..0780954b635 100644 --- a/cpp/src/Ice/FactoryTable.cpp +++ b/cpp/src/Ice/FactoryTable.cpp @@ -165,5 +165,3 @@ IceInternal::FactoryTable::removeTypeId(int compactId) } } } - - diff --git a/cpp/src/Ice/FactoryTableInit.cpp b/cpp/src/Ice/FactoryTableInit.cpp index 65f2c876afa..cdc0cdfda54 100644 --- a/cpp/src/Ice/FactoryTableInit.cpp +++ b/cpp/src/Ice/FactoryTableInit.cpp @@ -92,4 +92,3 @@ IceInternal::CompactIdInit::~CompactIdInit() { factoryTable->removeTypeId(_compactId); } - diff --git a/cpp/src/Ice/HashUtil.h b/cpp/src/Ice/HashUtil.h index 4f9edbb854e..1bf84d2a897 100644 --- a/cpp/src/Ice/HashUtil.h +++ b/cpp/src/Ice/HashUtil.h @@ -56,4 +56,3 @@ hashAdd(Ice::Int& hashCode, const std::map<K, V>& map) } #endif - diff --git a/cpp/src/Ice/LocalObject.cpp b/cpp/src/Ice/LocalObject.cpp index 1098a594ae6..55374d58a6c 100644 --- a/cpp/src/Ice/LocalObject.cpp +++ b/cpp/src/Ice/LocalObject.cpp @@ -26,4 +26,3 @@ Ice::LocalObject::operator<(const LocalObject& r) const { return this < &r; } - diff --git a/cpp/src/Ice/MetricsObserverI.cpp b/cpp/src/Ice/MetricsObserverI.cpp index fa4df95e083..2b0f8311c39 100644 --- a/cpp/src/Ice/MetricsObserverI.cpp +++ b/cpp/src/Ice/MetricsObserverI.cpp @@ -11,4 +11,3 @@ #include <Ice/Connection.h> #include <Ice/Endpoint.h> - diff --git a/cpp/src/Ice/PropertyNames.cpp b/cpp/src/Ice/PropertyNames.cpp index 19d052ae2d7..256efdd7913 100644 --- a/cpp/src/Ice/PropertyNames.cpp +++ b/cpp/src/Ice/PropertyNames.cpp @@ -1341,4 +1341,3 @@ const char* IceInternal::PropertyNames::clPropNames[] = "Freeze", 0 }; - diff --git a/cpp/src/Ice/ProtocolInstance.cpp b/cpp/src/Ice/ProtocolInstance.cpp index 43ed6b27bcc..98c75dc9bd2 100644 --- a/cpp/src/Ice/ProtocolInstance.cpp +++ b/cpp/src/Ice/ProtocolInstance.cpp @@ -134,4 +134,3 @@ IceInternal::ProtocolInstance::resolve(const string& host, int port, EndpointSel { _instance->endpointHostResolver()->resolve(host, port, type, endpt, cb); } - diff --git a/cpp/src/Ice/RetryQueue.h b/cpp/src/Ice/RetryQueue.h index 86e1511318a..21a4111b37f 100644 --- a/cpp/src/Ice/RetryQueue.h +++ b/cpp/src/Ice/RetryQueue.h @@ -70,4 +70,3 @@ private: } #endif - diff --git a/cpp/src/Ice/TcpAcceptor.cpp b/cpp/src/Ice/TcpAcceptor.cpp index 2d48b27e571..643acf96eab 100755 --- a/cpp/src/Ice/TcpAcceptor.cpp +++ b/cpp/src/Ice/TcpAcceptor.cpp @@ -359,4 +359,3 @@ IceInternal::TcpAcceptor::~TcpAcceptor() assert(_acceptFd == INVALID_SOCKET); #endif } - diff --git a/cpp/src/Ice/TcpAcceptor.h b/cpp/src/Ice/TcpAcceptor.h index ee92512030a..b7747264f6e 100644 --- a/cpp/src/Ice/TcpAcceptor.h +++ b/cpp/src/Ice/TcpAcceptor.h @@ -72,4 +72,3 @@ private: } #endif - diff --git a/cpp/src/Ice/Transceiver.cpp b/cpp/src/Ice/Transceiver.cpp index 7ce64323ab6..d866b2fb44a 100644 --- a/cpp/src/Ice/Transceiver.cpp +++ b/cpp/src/Ice/Transceiver.cpp @@ -21,4 +21,3 @@ IceInternal::Transceiver::bind() assert(false); return 0; } - diff --git a/cpp/src/IceBT/StreamSocket.h b/cpp/src/IceBT/StreamSocket.h index f2a8c8aa81d..e5062dfc9d1 100644 --- a/cpp/src/IceBT/StreamSocket.h +++ b/cpp/src/IceBT/StreamSocket.h @@ -56,4 +56,3 @@ typedef IceUtil::Handle<StreamSocket> StreamSocketPtr; } #endif - diff --git a/cpp/src/IceBox/Exception.cpp b/cpp/src/IceBox/Exception.cpp index dd75f530200..473e09ade1f 100644 --- a/cpp/src/IceBox/Exception.cpp +++ b/cpp/src/IceBox/Exception.cpp @@ -17,4 +17,3 @@ IceBox::FailureException::ice_print(ostream& out) const Exception::ice_print(out); out << ":\nservice failure exception: " << reason; } - diff --git a/cpp/src/IceBox/Service.cpp b/cpp/src/IceBox/Service.cpp index f1989701db5..5e7f29cfe13 100644 --- a/cpp/src/IceBox/Service.cpp +++ b/cpp/src/IceBox/Service.cpp @@ -155,4 +155,3 @@ main(int argc, char* argv[]) initData.properties->setProperty("Ice.Admin.DelayCreation", "1"); return svc.main(argc, argv, initData); } - diff --git a/cpp/src/IceBox/ServiceManagerI.cpp b/cpp/src/IceBox/ServiceManagerI.cpp index 5e1f76adc87..2f027994814 100644 --- a/cpp/src/IceBox/ServiceManagerI.cpp +++ b/cpp/src/IceBox/ServiceManagerI.cpp @@ -1179,4 +1179,3 @@ IceBox::ServiceManagerI::removeAdminFacets(const string& prefix) // Ignored } } - diff --git a/cpp/src/IceDB/Makefile.mk b/cpp/src/IceDB/Makefile.mk index fa8e18825ed..480d3fa3dae 100644 --- a/cpp/src/IceDB/Makefile.mk +++ b/cpp/src/IceDB/Makefile.mk @@ -15,4 +15,3 @@ IceDB_libs := lmdb IceDB_cppflags := -DICE_DB_API_EXPORTS projects += $(project) - diff --git a/cpp/src/IceGrid/AdminCallbackRouter.cpp b/cpp/src/IceGrid/AdminCallbackRouter.cpp index 4af6d299dbc..21191b06954 100644 --- a/cpp/src/IceGrid/AdminCallbackRouter.cpp +++ b/cpp/src/IceGrid/AdminCallbackRouter.cpp @@ -85,4 +85,3 @@ IceGrid::AdminCallbackRouter::ice_invoke_async(const AMD_Object_ice_invokePtr& c &AdminCallbackRouter::invokeException), cb); } - diff --git a/cpp/src/IceGrid/AdminI.cpp b/cpp/src/IceGrid/AdminI.cpp index 228f238efee..344fa0a1876 100644 --- a/cpp/src/IceGrid/AdminI.cpp +++ b/cpp/src/IceGrid/AdminI.cpp @@ -994,4 +994,3 @@ AdminI::checkIsReadOnly() const throw ex; } } - diff --git a/cpp/src/IceGrid/AdminSessionI.cpp b/cpp/src/IceGrid/AdminSessionI.cpp index 03e8fdde2cd..7f598c2223e 100644 --- a/cpp/src/IceGrid/AdminSessionI.cpp +++ b/cpp/src/IceGrid/AdminSessionI.cpp @@ -606,4 +606,3 @@ AdminSSLSessionManagerI::create(const Glacier2::SSLInfo& info, return _factory->createGlacier2Session(userDN, ctl); } - diff --git a/cpp/src/IceGrid/Allocatable.cpp b/cpp/src/IceGrid/Allocatable.cpp index a2979e1a883..608a3e30c87 100644 --- a/cpp/src/IceGrid/Allocatable.cpp +++ b/cpp/src/IceGrid/Allocatable.cpp @@ -532,4 +532,3 @@ Allocatable::allocateFromChild(const AllocationRequestPtr& request, } return allocationCount > 0; } - diff --git a/cpp/src/IceGrid/AllocatableObjectCache.cpp b/cpp/src/IceGrid/AllocatableObjectCache.cpp index 2a6e719b88b..5913dac2ae6 100644 --- a/cpp/src/IceGrid/AllocatableObjectCache.cpp +++ b/cpp/src/IceGrid/AllocatableObjectCache.cpp @@ -408,4 +408,3 @@ AllocatableObjectEntry::canTryAllocate() { return _cache.canTryAllocate(this); } - diff --git a/cpp/src/IceGrid/FileCache.cpp b/cpp/src/IceGrid/FileCache.cpp index 395a54d051c..e32d1fb2ea7 100644 --- a/cpp/src/IceGrid/FileCache.cpp +++ b/cpp/src/IceGrid/FileCache.cpp @@ -215,4 +215,3 @@ FileCache::read(const string& file, Ice::Long offset, int size, Ice::Long& newOf return is.eof(); } - diff --git a/cpp/src/IceGrid/Internal.ice b/cpp/src/IceGrid/Internal.ice index 0f078bf6bf6..f136dd99564 100644 --- a/cpp/src/IceGrid/Internal.ice +++ b/cpp/src/IceGrid/Internal.ice @@ -805,4 +805,3 @@ interface InternalRegistry extends FileReader } - diff --git a/cpp/src/IceGrid/LocatorRegistryI.cpp b/cpp/src/IceGrid/LocatorRegistryI.cpp index 8564d44942e..2a5a3c7a85b 100644 --- a/cpp/src/IceGrid/LocatorRegistryI.cpp +++ b/cpp/src/IceGrid/LocatorRegistryI.cpp @@ -476,4 +476,3 @@ LocatorRegistryI::getTraceLevels() const { return _database->getTraceLevels(); } - diff --git a/cpp/src/IceGrid/NodeAdminRouter.cpp b/cpp/src/IceGrid/NodeAdminRouter.cpp index 5100c8c9880..8f3e1a5ddc4 100644 --- a/cpp/src/IceGrid/NodeAdminRouter.cpp +++ b/cpp/src/IceGrid/NodeAdminRouter.cpp @@ -73,4 +73,3 @@ IceGrid::NodeServerAdminRouter::ice_invoke_async(const AMD_Object_ice_invokePtr& invokeOnTarget(target, cb, inParams, current); } - diff --git a/cpp/src/IceGrid/NodeI.cpp b/cpp/src/IceGrid/NodeI.cpp index e6a8f772a9b..b5e6d7ad2f5 100644 --- a/cpp/src/IceGrid/NodeI.cpp +++ b/cpp/src/IceGrid/NodeI.cpp @@ -1509,4 +1509,3 @@ NodeI::destroyServer(const AMD_Node_destroyServerPtr& amdCB, command->execute(); } } - diff --git a/cpp/src/IceGrid/NodeSessionI.cpp b/cpp/src/IceGrid/NodeSessionI.cpp index 645c3bb51c9..87558adfb9c 100644 --- a/cpp/src/IceGrid/NodeSessionI.cpp +++ b/cpp/src/IceGrid/NodeSessionI.cpp @@ -443,4 +443,3 @@ NodeSessionI::removeFeedback(const PatcherFeedbackPtr& feedback, const Ice::Iden _feedbacks.erase(feedback); } } - diff --git a/cpp/src/IceGrid/NodeSessionManager.cpp b/cpp/src/IceGrid/NodeSessionManager.cpp index c1231f5d6de..281c32cfacf 100644 --- a/cpp/src/IceGrid/NodeSessionManager.cpp +++ b/cpp/src/IceGrid/NodeSessionManager.cpp @@ -674,4 +674,3 @@ NodeSessionManager::createdSession(const NodeSessionPrx& session) (*p)->waitTryCreateSession(timeout); } } - diff --git a/cpp/src/IceGrid/ReplicaSessionManager.cpp b/cpp/src/IceGrid/ReplicaSessionManager.cpp index 8ed21322979..655bd26c441 100644 --- a/cpp/src/IceGrid/ReplicaSessionManager.cpp +++ b/cpp/src/IceGrid/ReplicaSessionManager.cpp @@ -669,4 +669,3 @@ ReplicaSessionManager::destroySession(const ReplicaSessionPrx& session) _observer = 0; } } - diff --git a/cpp/src/IceGrid/SessionI.cpp b/cpp/src/IceGrid/SessionI.cpp index 4cecfef3bf2..52f880936e1 100644 --- a/cpp/src/IceGrid/SessionI.cpp +++ b/cpp/src/IceGrid/SessionI.cpp @@ -403,4 +403,3 @@ ClientSSLSessionManagerI::create(const Glacier2::SSLInfo& info, return _factory->createGlacier2Session(userDN, ctl); } - diff --git a/cpp/src/IceGrid/WaitQueue.cpp b/cpp/src/IceGrid/WaitQueue.cpp index a714b515965..53c3f99d2b9 100644 --- a/cpp/src/IceGrid/WaitQueue.cpp +++ b/cpp/src/IceGrid/WaitQueue.cpp @@ -178,4 +178,3 @@ WaitQueue::remove(const WaitItemPtr& item) } return false; } - diff --git a/cpp/src/IceSSL/EndpointI.cpp b/cpp/src/IceSSL/EndpointI.cpp index 099818f8fbc..f4917973c63 100644 --- a/cpp/src/IceSSL/EndpointI.cpp +++ b/cpp/src/IceSSL/EndpointI.cpp @@ -375,4 +375,3 @@ IceSSL::EndpointFactoryI::readWithUnderlying(const IceInternal::EndpointIPtr& un { return ICE_MAKE_SHARED(EndpointI, _instance, underlying); } - diff --git a/cpp/src/IceSSL/PluginI.cpp b/cpp/src/IceSSL/PluginI.cpp index c12b3f9098e..74da15291b8 100755 --- a/cpp/src/IceSSL/PluginI.cpp +++ b/cpp/src/IceSSL/PluginI.cpp @@ -135,4 +135,3 @@ ICEregisterIceSSL(bool loadOnInitialize) { Ice::registerIceSSL(loadOnInitialize); } - diff --git a/cpp/src/IceStorm/IceStormInternal.ice b/cpp/src/IceStorm/IceStormInternal.ice index 450ffe44c4f..cd2884e6f0c 100644 --- a/cpp/src/IceStorm/IceStormInternal.ice +++ b/cpp/src/IceStorm/IceStormInternal.ice @@ -122,4 +122,3 @@ interface TopicManagerInternal extends TopicManager } } // End module IceStorm - diff --git a/cpp/src/IceStorm/InstrumentationI.cpp b/cpp/src/IceStorm/InstrumentationI.cpp index 15dd423e250..29112c87853 100644 --- a/cpp/src/IceStorm/InstrumentationI.cpp +++ b/cpp/src/IceStorm/InstrumentationI.cpp @@ -373,4 +373,3 @@ TopicManagerObserverI::getSubscriberObserver(const string& svc, } return 0; } - diff --git a/cpp/src/IceStorm/LLURecord.ice b/cpp/src/IceStorm/LLURecord.ice index 345faa804a3..1f33e2c7c62 100644 --- a/cpp/src/IceStorm/LLURecord.ice +++ b/cpp/src/IceStorm/LLURecord.ice @@ -24,4 +24,3 @@ struct LogUpdate } } - diff --git a/cpp/src/IceStorm/Service.cpp b/cpp/src/IceStorm/Service.cpp index 02b7f6336f5..5844e9853f8 100644 --- a/cpp/src/IceStorm/Service.cpp +++ b/cpp/src/IceStorm/Service.cpp @@ -573,4 +573,3 @@ ServiceI::validateProperties(const string& name, const PropertiesPtr& properties } } } - diff --git a/cpp/src/IceStorm/SubscriberRecord.ice b/cpp/src/IceStorm/SubscriberRecord.ice index 94f15664f57..a7624d9247e 100644 --- a/cpp/src/IceStorm/SubscriberRecord.ice +++ b/cpp/src/IceStorm/SubscriberRecord.ice @@ -66,4 +66,3 @@ struct SubscriberRecord sequence<SubscriberRecord> SubscriberRecordSeq; } // End module IceStorm - diff --git a/cpp/test/.gitignore b/cpp/test/.gitignore index cd450510b65..fe6afa02773 100644 --- a/cpp/test/.gitignore +++ b/cpp/test/.gitignore @@ -2,4 +2,4 @@ Debug/* Release/* TestSuite/Debug/* TestSuite/Release/* -*.pch
\ No newline at end of file +*.pch diff --git a/cpp/test/Glacier2/application/Callback.ice b/cpp/test/Glacier2/application/Callback.ice index 8a16bb84c4c..a221d277130 100644 --- a/cpp/test/Glacier2/application/Callback.ice +++ b/cpp/test/Glacier2/application/Callback.ice @@ -25,4 +25,3 @@ interface Callback } } - diff --git a/cpp/test/Glacier2/application/Client.cpp b/cpp/test/Glacier2/application/Client.cpp index 17f30885674..bc6fb814f5f 100644 --- a/cpp/test/Glacier2/application/Client.cpp +++ b/cpp/test/Glacier2/application/Client.cpp @@ -151,4 +151,3 @@ main(int argc, char* argv[]) communicator->destroy(); return status; } - diff --git a/cpp/test/Glacier2/application/Server.cpp b/cpp/test/Glacier2/application/Server.cpp index d03dd16835d..21b63dbb2cf 100644 --- a/cpp/test/Glacier2/application/Server.cpp +++ b/cpp/test/Glacier2/application/Server.cpp @@ -67,4 +67,3 @@ main(int argc, char* argv[]) Ice::InitializationData initData = getTestInitData(argc, argv); return app.main(argc, argv, initData); } - diff --git a/cpp/test/Glacier2/attack/Backend.ice b/cpp/test/Glacier2/attack/Backend.ice index b83c7827f70..759fb455a90 100644 --- a/cpp/test/Glacier2/attack/Backend.ice +++ b/cpp/test/Glacier2/attack/Backend.ice @@ -18,4 +18,3 @@ interface Backend } } - diff --git a/cpp/test/Glacier2/dynamicFiltering/Test.ice b/cpp/test/Glacier2/dynamicFiltering/Test.ice index a725dc48886..e72d91a7850 100644 --- a/cpp/test/Glacier2/dynamicFiltering/Test.ice +++ b/cpp/test/Glacier2/dynamicFiltering/Test.ice @@ -53,4 +53,3 @@ interface TestSession extends Glacier2::Session } } - diff --git a/cpp/test/Glacier2/override/Callback.ice b/cpp/test/Glacier2/override/Callback.ice index 8b80b52d2fb..2af777d65b3 100644 --- a/cpp/test/Glacier2/override/Callback.ice +++ b/cpp/test/Glacier2/override/Callback.ice @@ -31,4 +31,3 @@ interface Callback } } - diff --git a/cpp/test/Glacier2/router/Callback.ice b/cpp/test/Glacier2/router/Callback.ice index 9ba5aa49e96..87e6076a947 100644 --- a/cpp/test/Glacier2/router/Callback.ice +++ b/cpp/test/Glacier2/router/Callback.ice @@ -51,4 +51,3 @@ interface Callback } } - diff --git a/cpp/test/Glacier2/sessionControl/Session.ice b/cpp/test/Glacier2/sessionControl/Session.ice index e20c434c4e4..9491b312736 100644 --- a/cpp/test/Glacier2/sessionControl/Session.ice +++ b/cpp/test/Glacier2/sessionControl/Session.ice @@ -22,4 +22,3 @@ interface Session extends Glacier2::Session } } - diff --git a/cpp/test/Glacier2/sessionHelper/Callback.ice b/cpp/test/Glacier2/sessionHelper/Callback.ice index 3ab836f2d6e..d8d26b60a2d 100644 --- a/cpp/test/Glacier2/sessionHelper/Callback.ice +++ b/cpp/test/Glacier2/sessionHelper/Callback.ice @@ -37,4 +37,3 @@ interface Callback } } - diff --git a/cpp/test/Glacier2/sessionHelper/Server.cpp b/cpp/test/Glacier2/sessionHelper/Server.cpp index e2aef4d481c..d31562d9292 100644 --- a/cpp/test/Glacier2/sessionHelper/Server.cpp +++ b/cpp/test/Glacier2/sessionHelper/Server.cpp @@ -75,4 +75,3 @@ main(int argc, char* argv[]) cerr << "exit status: " << status << endl; return status; } - diff --git a/cpp/test/Glacier2/staticFiltering/Backend.ice b/cpp/test/Glacier2/staticFiltering/Backend.ice index b83c7827f70..759fb455a90 100644 --- a/cpp/test/Glacier2/staticFiltering/Backend.ice +++ b/cpp/test/Glacier2/staticFiltering/Backend.ice @@ -18,4 +18,3 @@ interface Backend } } - diff --git a/cpp/test/Ice/acm/Test.ice b/cpp/test/Ice/acm/Test.ice index 520c551ce34..3eef0a34184 100644 --- a/cpp/test/Ice/acm/Test.ice +++ b/cpp/test/Ice/acm/Test.ice @@ -36,4 +36,3 @@ interface RemoteCommunicator } } - diff --git a/cpp/test/Ice/ami/Test.ice b/cpp/test/Ice/ami/Test.ice index 55cb96b97b1..8ef2be51924 100644 --- a/cpp/test/Ice/ami/Test.ice +++ b/cpp/test/Ice/ami/Test.ice @@ -65,4 +65,3 @@ interface TestIntfController } } - diff --git a/cpp/test/Ice/background/Configuration.cpp b/cpp/test/Ice/background/Configuration.cpp index dff12668226..a6aeafa641a 100644 --- a/cpp/test/Ice/background/Configuration.cpp +++ b/cpp/test/Ice/background/Configuration.cpp @@ -198,4 +198,3 @@ Configuration::getInstance() { return _instance; } - diff --git a/cpp/test/Ice/background/Test.ice b/cpp/test/Ice/background/Test.ice index 8732c9d5213..9aa258770c1 100644 --- a/cpp/test/Ice/background/Test.ice +++ b/cpp/test/Ice/background/Test.ice @@ -45,4 +45,3 @@ interface BackgroundController } } - diff --git a/cpp/test/Ice/background/Transceiver.cpp b/cpp/test/Ice/background/Transceiver.cpp index a1b86860044..71716b424c5 100644 --- a/cpp/test/Ice/background/Transceiver.cpp +++ b/cpp/test/Ice/background/Transceiver.cpp @@ -269,4 +269,3 @@ Transceiver::Transceiver(const IceInternal::TransceiverPtr& transceiver) : _readBufferPos = _readBuffer.b.begin(); _readBuffer.i = _readBuffer.b.begin(); } - diff --git a/cpp/test/Ice/binding/Test.ice b/cpp/test/Ice/binding/Test.ice index 32929b4d959..de2937a32ce 100644 --- a/cpp/test/Ice/binding/Test.ice +++ b/cpp/test/Ice/binding/Test.ice @@ -34,4 +34,3 @@ interface RemoteCommunicator } } - diff --git a/cpp/test/Ice/binding/TestI.cpp b/cpp/test/Ice/binding/TestI.cpp index 1cafa284c46..ae8dcb83713 100644 --- a/cpp/test/Ice/binding/TestI.cpp +++ b/cpp/test/Ice/binding/TestI.cpp @@ -94,4 +94,3 @@ TestI::getAdapterName(const Ice::Current& current) { return current.adapter->getName(); } - diff --git a/cpp/test/Ice/checksum/Test.ice b/cpp/test/Ice/checksum/Test.ice index ba1f503b7ec..3eb3fc615a9 100644 --- a/cpp/test/Ice/checksum/Test.ice +++ b/cpp/test/Ice/checksum/Test.ice @@ -22,4 +22,3 @@ interface Checksum } } - diff --git a/cpp/test/Ice/custom/StringConverterI.cpp b/cpp/test/Ice/custom/StringConverterI.cpp index f66699e445f..1ae3c702114 100644 --- a/cpp/test/Ice/custom/StringConverterI.cpp +++ b/cpp/test/Ice/custom/StringConverterI.cpp @@ -68,4 +68,3 @@ Test::WstringConverterI::fromUTF8(const Byte* sourceStart, const Byte* sourceEnd } target = stringToWstring(s); } - diff --git a/cpp/test/Ice/custom/Wstring.ice b/cpp/test/Ice/custom/Wstring.ice index 2fa9db98fc2..766f6bb5a8b 100644 --- a/cpp/test/Ice/custom/Wstring.ice +++ b/cpp/test/Ice/custom/Wstring.ice @@ -66,4 +66,3 @@ dictionary<["cpp:type:wstring"] string, ["cpp:type:wstring"] string> WstringWStr } } - diff --git a/cpp/test/Ice/custom/WstringAMD.ice b/cpp/test/Ice/custom/WstringAMD.ice index 46d9078b6e7..ef11172bbd9 100644 --- a/cpp/test/Ice/custom/WstringAMD.ice +++ b/cpp/test/Ice/custom/WstringAMD.ice @@ -66,4 +66,3 @@ dictionary<["cpp:type:wstring"] string, ["cpp:type:wstring"] string> WstringWStr } } - diff --git a/cpp/test/Ice/defaultServant/Makefile.mk b/cpp/test/Ice/defaultServant/Makefile.mk index 17b04b2d796..48ddbca1b5c 100644 --- a/cpp/test/Ice/defaultServant/Makefile.mk +++ b/cpp/test/Ice/defaultServant/Makefile.mk @@ -9,4 +9,4 @@ $(test)_client_sources = Client.cpp AllTests.cpp Test.ice TestI.cpp -tests += $(test)
\ No newline at end of file +tests += $(test) diff --git a/cpp/test/Ice/defaultServant/Test.ice b/cpp/test/Ice/defaultServant/Test.ice index 008af826dc6..dab067ec07f 100644 --- a/cpp/test/Ice/defaultServant/Test.ice +++ b/cpp/test/Ice/defaultServant/Test.ice @@ -18,4 +18,3 @@ interface MyObject } } - diff --git a/cpp/test/Ice/dispatcher/Makefile.mk b/cpp/test/Ice/dispatcher/Makefile.mk index ed8a69360e1..2509764e36b 100644 --- a/cpp/test/Ice/dispatcher/Makefile.mk +++ b/cpp/test/Ice/dispatcher/Makefile.mk @@ -10,4 +10,4 @@ $(test)_client_sources = $(test-client-sources) Dispatcher.cpp $(test)_server_sources = $(test-server-sources) Dispatcher.cpp -tests += $(test)
\ No newline at end of file +tests += $(test) diff --git a/cpp/test/Ice/dispatcher/Test.ice b/cpp/test/Ice/dispatcher/Test.ice index 16999999741..262051819c3 100644 --- a/cpp/test/Ice/dispatcher/Test.ice +++ b/cpp/test/Ice/dispatcher/Test.ice @@ -29,4 +29,3 @@ interface TestIntfController } } - diff --git a/cpp/test/Ice/exceptions/Makefile.mk b/cpp/test/Ice/exceptions/Makefile.mk index 5be8fd01531..b7cf8cc064c 100644 --- a/cpp/test/Ice/exceptions/Makefile.mk +++ b/cpp/test/Ice/exceptions/Makefile.mk @@ -11,4 +11,4 @@ $(test)_client_sources = $(test-client-sources) ExceptionsI.cpp $(test)_server_sources = $(test-server-sources) ExceptionsI.cpp $(test)_serveramd_sources = $(test-serveramd-sources) ExceptionsI.cpp -tests += $(test)
\ No newline at end of file +tests += $(test) diff --git a/cpp/test/Ice/exceptions/Test.ice b/cpp/test/Ice/exceptions/Test.ice index 145811a6449..794fcd7d863 100644 --- a/cpp/test/Ice/exceptions/Test.ice +++ b/cpp/test/Ice/exceptions/Test.ice @@ -106,4 +106,3 @@ interface WrongOperation } } - diff --git a/cpp/test/Ice/exceptions/TestAMD.ice b/cpp/test/Ice/exceptions/TestAMD.ice index 153692feb78..6cca12e0837 100644 --- a/cpp/test/Ice/exceptions/TestAMD.ice +++ b/cpp/test/Ice/exceptions/TestAMD.ice @@ -112,4 +112,3 @@ module Mod } } - diff --git a/cpp/test/Ice/facets/Test.ice b/cpp/test/Ice/facets/Test.ice index 4269e7deb11..8a55ad38274 100644 --- a/cpp/test/Ice/facets/Test.ice +++ b/cpp/test/Ice/facets/Test.ice @@ -58,4 +58,3 @@ interface H extends G } } - diff --git a/cpp/test/Ice/hash/Test.ice b/cpp/test/Ice/hash/Test.ice index f7bc51e3f85..fc654d284c6 100644 --- a/cpp/test/Ice/hash/Test.ice +++ b/cpp/test/Ice/hash/Test.ice @@ -17,4 +17,3 @@ class Point } } - diff --git a/cpp/test/Ice/impl/msbuild/server/dummy.txt b/cpp/test/Ice/impl/msbuild/server/dummy.txt index bc0a314a3b7..a38380ac11f 100644 --- a/cpp/test/Ice/impl/msbuild/server/dummy.txt +++ b/cpp/test/Ice/impl/msbuild/server/dummy.txt @@ -1 +1 @@ -# Dumy file to run slice2cpp --impl
\ No newline at end of file +# Dumy file to run slice2cpp --impl diff --git a/cpp/test/Ice/impl/msbuild/serveramd/dummy.txt b/cpp/test/Ice/impl/msbuild/serveramd/dummy.txt index bc0a314a3b7..a38380ac11f 100644 --- a/cpp/test/Ice/impl/msbuild/serveramd/dummy.txt +++ b/cpp/test/Ice/impl/msbuild/serveramd/dummy.txt @@ -1 +1 @@ -# Dumy file to run slice2cpp --impl
\ No newline at end of file +# Dumy file to run slice2cpp --impl diff --git a/cpp/test/Ice/info/Makefile.mk b/cpp/test/Ice/info/Makefile.mk index c51423f6b93..c918e439188 100644 --- a/cpp/test/Ice/info/Makefile.mk +++ b/cpp/test/Ice/info/Makefile.mk @@ -10,4 +10,4 @@ $(test)_client_sources = Test.ice TestI.cpp Client.cpp AllTests.cpp $(test)_dependencies = IceSSL Ice TestCommon -tests += $(test)
\ No newline at end of file +tests += $(test) diff --git a/cpp/test/Ice/interceptor/Makefile.mk b/cpp/test/Ice/interceptor/Makefile.mk index ee1c8b04830..d191a0d9b49 100644 --- a/cpp/test/Ice/interceptor/Makefile.mk +++ b/cpp/test/Ice/interceptor/Makefile.mk @@ -9,4 +9,4 @@ $(test)_client_sources = Client.cpp Test.ice TestI.cpp MyObjectI.cpp InterceptorI.cpp AMDInterceptorI.cpp -tests += $(test)
\ No newline at end of file +tests += $(test) diff --git a/cpp/test/Ice/invoke/Makefile.mk b/cpp/test/Ice/invoke/Makefile.mk index 508536e6c68..6d32f03cecb 100644 --- a/cpp/test/Ice/invoke/Makefile.mk +++ b/cpp/test/Ice/invoke/Makefile.mk @@ -9,4 +9,4 @@ $(test)_server_sources = Server.cpp Test.ice BlobjectI.cpp -tests += $(test)
\ No newline at end of file +tests += $(test) diff --git a/cpp/test/Ice/library/AllTests.cpp b/cpp/test/Ice/library/AllTests.cpp index c8ce74fed81..48b7e95d421 100644 --- a/cpp/test/Ice/library/AllTests.cpp +++ b/cpp/test/Ice/library/AllTests.cpp @@ -41,4 +41,3 @@ void allTests(const Ice::ObjectAdapterPtr& oa) Test::MyInterfacePrxPtr proxy = ICE_UNCHECKED_CAST(Test::MyInterfacePrx, oa->addWithUUID(servant)); consume(servant, proxy); } - diff --git a/cpp/test/Ice/location/Makefile.mk b/cpp/test/Ice/location/Makefile.mk index 75a279f58bc..204c8c24b6d 100644 --- a/cpp/test/Ice/location/Makefile.mk +++ b/cpp/test/Ice/location/Makefile.mk @@ -9,4 +9,4 @@ $(test)_server_sources = $(test-server-sources) ServerLocator.cpp -tests += $(test)
\ No newline at end of file +tests += $(test) diff --git a/cpp/test/Ice/logger/Makefile.mk b/cpp/test/Ice/logger/Makefile.mk index 86b55596f39..004aa586fb0 100644 --- a/cpp/test/Ice/logger/Makefile.mk +++ b/cpp/test/Ice/logger/Makefile.mk @@ -16,4 +16,4 @@ $(test)_client3_sources = Client3.cpp $(test)_client4_sources = Client4.cpp $(test)_client5_sources = Client5.cpp -tests += $(test)
\ No newline at end of file +tests += $(test) diff --git a/cpp/test/Ice/logger/config.client b/cpp/test/Ice/logger/config.client index b539997fb40..22db49374f3 100644 --- a/cpp/test/Ice/logger/config.client +++ b/cpp/test/Ice/logger/config.client @@ -1,4 +1,4 @@ # # The properties files is UTF8 encoded. # -Ice.ProgramName = aplicación
\ No newline at end of file +Ice.ProgramName = aplicación diff --git a/cpp/test/Ice/objects/Makefile.mk b/cpp/test/Ice/objects/Makefile.mk index 9cbae24e215..7f90ebfbb44 100644 --- a/cpp/test/Ice/objects/Makefile.mk +++ b/cpp/test/Ice/objects/Makefile.mk @@ -12,4 +12,4 @@ $(test)_client_sources = Client.cpp Test.ice Derived.ice DerivedEx.ice $(test)_server_sources = Server.cpp Test.ice Derived.ice DerivedEx.ice TestI.cpp TestIntfI.cpp $(test)_collocated_sources = Collocated.cpp Test.ice Derived.ice DerivedEx.ice TestI.cpp TestIntfI.cpp AllTests.cpp -tests += $(test)
\ No newline at end of file +tests += $(test) diff --git a/cpp/test/Ice/operations/TestAMDI.cpp b/cpp/test/Ice/operations/TestAMDI.cpp index f24f5b95fa0..21b49be2600 100644 --- a/cpp/test/Ice/operations/TestAMDI.cpp +++ b/cpp/test/Ice/operations/TestAMDI.cpp @@ -1900,4 +1900,3 @@ MyDerivedClassI::opMDict2_async(const Test::AMD_MyClass_opMDict2Ptr& cb, } #endif - diff --git a/cpp/test/Ice/properties/config/config.1 b/cpp/test/Ice/properties/config/config.1 index 2a20653e4c5..77d9c61cd04 100644 --- a/cpp/test/Ice/properties/config/config.1 +++ b/cpp/test/Ice/properties/config/config.1 @@ -1 +1 @@ -Config1=Config1
\ No newline at end of file +Config1=Config1 diff --git a/cpp/test/Ice/properties/config/config.2 b/cpp/test/Ice/properties/config/config.2 index be276df6602..f6fc2c4c692 100644 --- a/cpp/test/Ice/properties/config/config.2 +++ b/cpp/test/Ice/properties/config/config.2 @@ -1 +1 @@ -Config2=Config2
\ No newline at end of file +Config2=Config2 diff --git a/cpp/test/Ice/properties/config/config.3 b/cpp/test/Ice/properties/config/config.3 index 55c1e1123f6..35e1cf8be44 100644 --- a/cpp/test/Ice/properties/config/config.3 +++ b/cpp/test/Ice/properties/config/config.3 @@ -1 +1 @@ -Config3=Config3
\ No newline at end of file +Config3=Config3 diff --git a/cpp/test/Ice/properties/config/configPath b/cpp/test/Ice/properties/config/configPath index 02926394df5..59d8001a8ce 100644 --- a/cpp/test/Ice/properties/config/configPath +++ b/cpp/test/Ice/properties/config/configPath @@ -1 +1 @@ -./config/中国_client.config
\ No newline at end of file +./config/中国_client.config diff --git a/cpp/test/Ice/properties/config/escapes.cfg b/cpp/test/Ice/properties/config/escapes.cfg index 4c3376d550a..bd7c16643d9 100755 --- a/cpp/test/Ice/properties/config/escapes.cfg +++ b/cpp/test/Ice/properties/config/escapes.cfg @@ -29,7 +29,3 @@ C=5=\#6 # 7 # Name is "C", value is "5=#6" AServer=\\\\server\dir # Value is "\\server\dir" BServer=\\server\\dir # Value is "\server\dir" - - - - diff --git a/cpp/test/Ice/proxy/Collocated.cpp b/cpp/test/Ice/proxy/Collocated.cpp index d21086c95df..3aca8e940dd 100644 --- a/cpp/test/Ice/proxy/Collocated.cpp +++ b/cpp/test/Ice/proxy/Collocated.cpp @@ -51,4 +51,3 @@ main(int argc, char* argv[]) return EXIT_FAILURE; } } - diff --git a/cpp/test/Ice/retry/Makefile.mk b/cpp/test/Ice/retry/Makefile.mk index 199a5a45fb4..8c914455cd8 100644 --- a/cpp/test/Ice/retry/Makefile.mk +++ b/cpp/test/Ice/retry/Makefile.mk @@ -9,4 +9,4 @@ $(test)_client_sources = Client.cpp AllTests.cpp Test.ice InstrumentationI.cpp -tests += $(test)
\ No newline at end of file +tests += $(test) diff --git a/cpp/test/Ice/servantLocator/AllTests.cpp b/cpp/test/Ice/servantLocator/AllTests.cpp index 65b1cdc8de1..5606420c860 100644 --- a/cpp/test/Ice/servantLocator/AllTests.cpp +++ b/cpp/test/Ice/servantLocator/AllTests.cpp @@ -372,4 +372,3 @@ allTests(const CommunicatorPtr& communicator) } return obj; } - diff --git a/cpp/test/Ice/servantLocator/TestAMD.ice b/cpp/test/Ice/servantLocator/TestAMD.ice index a5fa6bfe387..b0d69ad29ee 100644 --- a/cpp/test/Ice/servantLocator/TestAMD.ice +++ b/cpp/test/Ice/servantLocator/TestAMD.ice @@ -53,4 +53,3 @@ local class Cookie } } - diff --git a/cpp/test/Ice/servantLocator/TestI.cpp b/cpp/test/Ice/servantLocator/TestI.cpp index e43ebe45813..af1b8022ee2 100644 --- a/cpp/test/Ice/servantLocator/TestI.cpp +++ b/cpp/test/Ice/servantLocator/TestI.cpp @@ -115,4 +115,3 @@ CookieI::message() const { return "blahblah"; } - diff --git a/cpp/test/Ice/services/Makefile.mk b/cpp/test/Ice/services/Makefile.mk index d0ac35ce1e3..ca58d972046 100644 --- a/cpp/test/Ice/services/Makefile.mk +++ b/cpp/test/Ice/services/Makefile.mk @@ -9,4 +9,4 @@ $(test)_dependencies = Glacier2 IceStorm IceGrid Ice TestCommon -tests += $(test)
\ No newline at end of file +tests += $(test) diff --git a/cpp/test/Ice/slicing/exceptions/Makefile.mk b/cpp/test/Ice/slicing/exceptions/Makefile.mk index 94b1fad8905..84f2ece17a9 100644 --- a/cpp/test/Ice/slicing/exceptions/Makefile.mk +++ b/cpp/test/Ice/slicing/exceptions/Makefile.mk @@ -12,4 +12,4 @@ $(test)_client_sources = $(test-client-sources) ClientPrivate.ice $(test)_server_sources = $(test-server-sources) ServerPrivate.ice $(test)_serveramd_sources = $(test-serveramd-sources) ServerPrivateAMD.ice -tests += $(test)
\ No newline at end of file +tests += $(test) diff --git a/cpp/test/Ice/slicing/objects/Makefile.mk b/cpp/test/Ice/slicing/objects/Makefile.mk index 94b1fad8905..84f2ece17a9 100644 --- a/cpp/test/Ice/slicing/objects/Makefile.mk +++ b/cpp/test/Ice/slicing/objects/Makefile.mk @@ -12,4 +12,4 @@ $(test)_client_sources = $(test-client-sources) ClientPrivate.ice $(test)_server_sources = $(test-server-sources) ServerPrivate.ice $(test)_serveramd_sources = $(test-serveramd-sources) ServerPrivateAMD.ice -tests += $(test)
\ No newline at end of file +tests += $(test) diff --git a/cpp/test/Ice/slicing/objects/Test.ice b/cpp/test/Ice/slicing/objects/Test.ice index 6c25277a348..d28c515da65 100644 --- a/cpp/test/Ice/slicing/objects/Test.ice +++ b/cpp/test/Ice/slicing/objects/Test.ice @@ -171,4 +171,3 @@ class Forward } } - diff --git a/cpp/test/Ice/stream/Test.ice b/cpp/test/Ice/stream/Test.ice index 414b2130450..858ea5d90d2 100644 --- a/cpp/test/Ice/stream/Test.ice +++ b/cpp/test/Ice/stream/Test.ice @@ -169,4 +169,3 @@ module Sub2 } } } - diff --git a/cpp/test/Ice/stringConverter/Test.ice b/cpp/test/Ice/stringConverter/Test.ice index 44e5fd239e0..c1013041dad 100644 --- a/cpp/test/Ice/stringConverter/Test.ice +++ b/cpp/test/Ice/stringConverter/Test.ice @@ -23,4 +23,3 @@ interface MyObject } } - diff --git a/cpp/test/Ice/threadPoolPriority/AllTests.cpp b/cpp/test/Ice/threadPoolPriority/AllTests.cpp index b5394fa9661..32840d5323b 100644 --- a/cpp/test/Ice/threadPoolPriority/AllTests.cpp +++ b/cpp/test/Ice/threadPoolPriority/AllTests.cpp @@ -41,4 +41,3 @@ allTests(const Ice::CommunicatorPtr& communicator) return priority; } - diff --git a/cpp/test/Ice/threadPoolPriority/Makefile.mk b/cpp/test/Ice/threadPoolPriority/Makefile.mk index 4dfed32a0c4..6d58028de5d 100644 --- a/cpp/test/Ice/threadPoolPriority/Makefile.mk +++ b/cpp/test/Ice/threadPoolPriority/Makefile.mk @@ -11,4 +11,4 @@ $(test)_programs := client server servercustom $(test)_servercustom_sources := ServerCustomThreadPool.cpp Test.ice TestI.cpp -tests += $(test)
\ No newline at end of file +tests += $(test) diff --git a/cpp/test/Ice/timeout/Makefile.mk b/cpp/test/Ice/timeout/Makefile.mk index 1b766876355..02a38cb9807 100644 --- a/cpp/test/Ice/timeout/Makefile.mk +++ b/cpp/test/Ice/timeout/Makefile.mk @@ -9,4 +9,4 @@ $(test)_client_sources = $(test-client-sources) TestI.cpp -tests += $(test)
\ No newline at end of file +tests += $(test) diff --git a/cpp/test/Ice/udp/Server.cpp b/cpp/test/Ice/udp/Server.cpp index 7cbc9ed1e99..83b26ea58fb 100644 --- a/cpp/test/Ice/udp/Server.cpp +++ b/cpp/test/Ice/udp/Server.cpp @@ -86,4 +86,3 @@ main(int argc, char* argv[]) return EXIT_FAILURE; } } - diff --git a/cpp/test/IceBox/configuration/AllTests.cpp b/cpp/test/IceBox/configuration/AllTests.cpp index 9afd3c958f5..1618d4c2d37 100644 --- a/cpp/test/IceBox/configuration/AllTests.cpp +++ b/cpp/test/IceBox/configuration/AllTests.cpp @@ -88,4 +88,3 @@ allTests(const Ice::CommunicatorPtr& com) cout << "ok" << endl; } } - diff --git a/cpp/test/IceBox/configuration/Service.cpp b/cpp/test/IceBox/configuration/Service.cpp index e00bfc9f411..1a89f04a1b7 100644 --- a/cpp/test/IceBox/configuration/Service.cpp +++ b/cpp/test/IceBox/configuration/Service.cpp @@ -66,4 +66,3 @@ void ServiceI::stop() { } - diff --git a/cpp/test/IceBox/configuration/config.service4 b/cpp/test/IceBox/configuration/config.service4 index a70120dd192..4ce837c863c 100644 --- a/cpp/test/IceBox/configuration/config.service4 +++ b/cpp/test/IceBox/configuration/config.service4 @@ -3,4 +3,3 @@ Service4OA.Endpoints=default -p 12013 -h 127.0.0.1 #Ice.ProgramName Service=4 Prop= - diff --git a/cpp/test/IceGrid/activation/Makefile.mk b/cpp/test/IceGrid/activation/Makefile.mk index 7f6d5ec0cac..35bcb38800f 100644 --- a/cpp/test/IceGrid/activation/Makefile.mk +++ b/cpp/test/IceGrid/activation/Makefile.mk @@ -9,4 +9,4 @@ $(test)_client_dependencies = IceGrid Glacier2 -tests += $(test)
\ No newline at end of file +tests += $(test) diff --git a/cpp/test/IceGrid/admin/Makefile.mk b/cpp/test/IceGrid/admin/Makefile.mk index e3c7734888a..50b2be99974 100644 --- a/cpp/test/IceGrid/admin/Makefile.mk +++ b/cpp/test/IceGrid/admin/Makefile.mk @@ -10,4 +10,4 @@ # This Makefile.mk is necessary to get this test to build because the # test doesn't have a Client.cpp file. -tests += $(test)
\ No newline at end of file +tests += $(test) diff --git a/cpp/test/IceGrid/admin/test.py b/cpp/test/IceGrid/admin/test.py index f7bc4c20212..46adddc4388 100644 --- a/cpp/test/IceGrid/admin/test.py +++ b/cpp/test/IceGrid/admin/test.py @@ -163,4 +163,4 @@ routerProps= lambda process, current: { 'IceSSL.VerifyPeer' : 1 } -TestSuite(__file__, [ IceGridAdminTestCase() ], multihost=False)
\ No newline at end of file +TestSuite(__file__, [ IceGridAdminTestCase() ], multihost=False) diff --git a/cpp/test/IceGrid/allocation/Makefile.mk b/cpp/test/IceGrid/allocation/Makefile.mk index 228479499eb..eb15d76f4c3 100644 --- a/cpp/test/IceGrid/allocation/Makefile.mk +++ b/cpp/test/IceGrid/allocation/Makefile.mk @@ -14,4 +14,4 @@ $(test)_client_dependencies = IceGrid Glacier2 $(test)_verifier_sources = PermissionsVerifier.cpp $(test)_verifier_dependencies = Glacier2 -tests += $(test)
\ No newline at end of file +tests += $(test) diff --git a/cpp/test/IceGrid/allocation/test.py b/cpp/test/IceGrid/allocation/test.py index 95bebe76add..4cfc0f6c50e 100644 --- a/cpp/test/IceGrid/allocation/test.py +++ b/cpp/test/IceGrid/allocation/test.py @@ -8,4 +8,4 @@ # # ********************************************************************** -TestSuite(__file__, [IceGridTestCase(exevars={ "verifier.dir": "verifier" })], runOnMainThread=True, multihost=False)
\ No newline at end of file +TestSuite(__file__, [IceGridTestCase(exevars={ "verifier.dir": "verifier" })], runOnMainThread=True, multihost=False) diff --git a/cpp/test/IceGrid/deployer/Makefile.mk b/cpp/test/IceGrid/deployer/Makefile.mk index 7b6f23f2e8e..11b7ef0b6f2 100644 --- a/cpp/test/IceGrid/deployer/Makefile.mk +++ b/cpp/test/IceGrid/deployer/Makefile.mk @@ -16,4 +16,4 @@ $(test)_TestService_soversion = $(test)_client_dependencies = IceGrid Glacier2 -tests += $(test)
\ No newline at end of file +tests += $(test) diff --git a/cpp/test/IceGrid/deployer/Service.cpp b/cpp/test/IceGrid/deployer/Service.cpp index 0238667f646..4a53b7ba594 100644 --- a/cpp/test/IceGrid/deployer/Service.cpp +++ b/cpp/test/IceGrid/deployer/Service.cpp @@ -66,4 +66,3 @@ void ServiceI::stop() { } - diff --git a/cpp/test/IceGrid/distribution/Makefile.mk b/cpp/test/IceGrid/distribution/Makefile.mk index 7f6d5ec0cac..35bcb38800f 100644 --- a/cpp/test/IceGrid/distribution/Makefile.mk +++ b/cpp/test/IceGrid/distribution/Makefile.mk @@ -9,4 +9,4 @@ $(test)_client_dependencies = IceGrid Glacier2 -tests += $(test)
\ No newline at end of file +tests += $(test) diff --git a/cpp/test/IceGrid/distribution/test.py b/cpp/test/IceGrid/distribution/test.py index eca468f25fa..29a60d28114 100644 --- a/cpp/test/IceGrid/distribution/test.py +++ b/cpp/test/IceGrid/distribution/test.py @@ -42,4 +42,4 @@ class IceGridDistributionTestCase(IceGridTestCase): current.writeln("ok") -TestSuite(__file__, [ IceGridDistributionTestCase() ], runOnMainThread=True, multihost=False)
\ No newline at end of file +TestSuite(__file__, [ IceGridDistributionTestCase() ], runOnMainThread=True, multihost=False) diff --git a/cpp/test/IceGrid/fileLock/test.py b/cpp/test/IceGrid/fileLock/test.py index 69177cd844a..413675f0c36 100644 --- a/cpp/test/IceGrid/fileLock/test.py +++ b/cpp/test/IceGrid/fileLock/test.py @@ -20,4 +20,4 @@ class IceGridAdminTestCase(IceGridTestCase): print("ok") -TestSuite(__file__, [ IceGridAdminTestCase(application=None) ], runOnMainThread=True, multihost=False)
\ No newline at end of file +TestSuite(__file__, [ IceGridAdminTestCase(application=None) ], runOnMainThread=True, multihost=False) diff --git a/cpp/test/IceGrid/noRestartUpdate/Makefile.mk b/cpp/test/IceGrid/noRestartUpdate/Makefile.mk index 7b6f23f2e8e..11b7ef0b6f2 100644 --- a/cpp/test/IceGrid/noRestartUpdate/Makefile.mk +++ b/cpp/test/IceGrid/noRestartUpdate/Makefile.mk @@ -16,4 +16,4 @@ $(test)_TestService_soversion = $(test)_client_dependencies = IceGrid Glacier2 -tests += $(test)
\ No newline at end of file +tests += $(test) diff --git a/cpp/test/IceGrid/noRestartUpdate/Service.cpp b/cpp/test/IceGrid/noRestartUpdate/Service.cpp index 436e5d32165..3fc96048191 100644 --- a/cpp/test/IceGrid/noRestartUpdate/Service.cpp +++ b/cpp/test/IceGrid/noRestartUpdate/Service.cpp @@ -66,4 +66,3 @@ void ServiceI::stop() { } - diff --git a/cpp/test/IceGrid/noRestartUpdate/test.py b/cpp/test/IceGrid/noRestartUpdate/test.py index d000521575b..99e2d41d0b7 100644 --- a/cpp/test/IceGrid/noRestartUpdate/test.py +++ b/cpp/test/IceGrid/noRestartUpdate/test.py @@ -23,4 +23,4 @@ clientProps = lambda process, current: { TestSuite(__file__, [IceGridNoRestartUpdateTestCase(application=None, client=IceGridClient(props=clientProps))], - multihost=False)
\ No newline at end of file + multihost=False) diff --git a/cpp/test/IceGrid/replicaGroup/Makefile.mk b/cpp/test/IceGrid/replicaGroup/Makefile.mk index 680829b6ece..04200294127 100644 --- a/cpp/test/IceGrid/replicaGroup/Makefile.mk +++ b/cpp/test/IceGrid/replicaGroup/Makefile.mk @@ -19,4 +19,4 @@ $(test)_RegistryPlugin_dependencies = IceGrid Glacier2 $(test)_client_dependencies = IceGrid Glacier2 -tests += $(test)
\ No newline at end of file +tests += $(test) diff --git a/cpp/test/IceGrid/replicaGroup/Service.cpp b/cpp/test/IceGrid/replicaGroup/Service.cpp index 6e0df00e346..c438d177732 100644 --- a/cpp/test/IceGrid/replicaGroup/Service.cpp +++ b/cpp/test/IceGrid/replicaGroup/Service.cpp @@ -66,4 +66,3 @@ void ServiceI::stop() { } - diff --git a/cpp/test/IceGrid/replication/Makefile.mk b/cpp/test/IceGrid/replication/Makefile.mk index 7f6d5ec0cac..35bcb38800f 100644 --- a/cpp/test/IceGrid/replication/Makefile.mk +++ b/cpp/test/IceGrid/replication/Makefile.mk @@ -9,4 +9,4 @@ $(test)_client_dependencies = IceGrid Glacier2 -tests += $(test)
\ No newline at end of file +tests += $(test) diff --git a/cpp/test/IceGrid/replication/TestI.cpp b/cpp/test/IceGrid/replication/TestI.cpp index c1c79d68a4e..88c06d81b02 100644 --- a/cpp/test/IceGrid/replication/TestI.cpp +++ b/cpp/test/IceGrid/replication/TestI.cpp @@ -13,4 +13,3 @@ TestI::TestI() { } - diff --git a/cpp/test/IceGrid/replication/test.py b/cpp/test/IceGrid/replication/test.py index 8d2a57c7869..2cc108409d8 100644 --- a/cpp/test/IceGrid/replication/test.py +++ b/cpp/test/IceGrid/replication/test.py @@ -10,4 +10,4 @@ clientProps = lambda process, current: { "ServerDir" : current.getBuildDir("server") } -TestSuite(__file__, [ IceGridTestCase(client=IceGridClient(props=clientProps)) ], runOnMainThread=True, multihost=False)
\ No newline at end of file +TestSuite(__file__, [ IceGridTestCase(client=IceGridClient(props=clientProps)) ], runOnMainThread=True, multihost=False) diff --git a/cpp/test/IceGrid/session/Makefile.mk b/cpp/test/IceGrid/session/Makefile.mk index 3b6a9a5eb4c..61711584f31 100644 --- a/cpp/test/IceGrid/session/Makefile.mk +++ b/cpp/test/IceGrid/session/Makefile.mk @@ -16,4 +16,4 @@ $(test)_server_dependencies = Glacier2 IceSSL $(test)_verifier_sources = PermissionsVerifier.cpp Test.ice $(test)_verifier_dependencies = Glacier2 -tests += $(test)
\ No newline at end of file +tests += $(test) diff --git a/cpp/test/IceGrid/simple/Makefile.mk b/cpp/test/IceGrid/simple/Makefile.mk index 6cfc08543f1..d390508422f 100644 --- a/cpp/test/IceGrid/simple/Makefile.mk +++ b/cpp/test/IceGrid/simple/Makefile.mk @@ -9,4 +9,4 @@ $(test)_dependencies = IceLocatorDiscovery IceGrid Glacier2 Ice TestCommon -tests += $(test)
\ No newline at end of file +tests += $(test) diff --git a/cpp/test/IceGrid/update/Makefile.mk b/cpp/test/IceGrid/update/Makefile.mk index 7f6d5ec0cac..35bcb38800f 100644 --- a/cpp/test/IceGrid/update/Makefile.mk +++ b/cpp/test/IceGrid/update/Makefile.mk @@ -9,4 +9,4 @@ $(test)_client_dependencies = IceGrid Glacier2 -tests += $(test)
\ No newline at end of file +tests += $(test) diff --git a/cpp/test/IceGrid/update/Test.ice b/cpp/test/IceGrid/update/Test.ice index 2030ef2a5bf..ff85256e0ac 100644 --- a/cpp/test/IceGrid/update/Test.ice +++ b/cpp/test/IceGrid/update/Test.ice @@ -20,4 +20,3 @@ interface TestIntf } } - diff --git a/cpp/test/IceGrid/update/test.py b/cpp/test/IceGrid/update/test.py index 0e1f4449eff..ba80d752117 100644 --- a/cpp/test/IceGrid/update/test.py +++ b/cpp/test/IceGrid/update/test.py @@ -24,4 +24,4 @@ clientProps = lambda process, current: { } if isinstance(platform, Windows) or os.getuid() != 0: - TestSuite(__file__, [IceGridUpdateTestCase(application=None, client=IceGridClient(props=clientProps))], multihost=False)
\ No newline at end of file + TestSuite(__file__, [IceGridUpdateTestCase(application=None, client=IceGridClient(props=clientProps))], multihost=False) diff --git a/cpp/test/IceSSL/certs/cacert_custom.req b/cpp/test/IceSSL/certs/cacert_custom.req index 9306f52b665..8903cb53446 100644 --- a/cpp/test/IceSSL/certs/cacert_custom.req +++ b/cpp/test/IceSSL/certs/cacert_custom.req @@ -13,5 +13,3 @@ organizationName = ZeroC organizationalUnitName = Ice commonName = CA emailAddress = info@zeroc.com - - diff --git a/cpp/test/IceSSL/certs/db/.gitignore b/cpp/test/IceSSL/certs/db/.gitignore index d76ff1326c0..99a18577d42 100644 --- a/cpp/test/IceSSL/certs/db/.gitignore +++ b/cpp/test/IceSSL/certs/db/.gitignore @@ -1,2 +1,2 @@ # Temporary files generated by IceCertUtils -*.p12
\ No newline at end of file +*.p12 diff --git a/cpp/test/IceStorm/federation/Makefile.mk b/cpp/test/IceStorm/federation/Makefile.mk index d1e5e23feab..0299f340d8b 100644 --- a/cpp/test/IceStorm/federation/Makefile.mk +++ b/cpp/test/IceStorm/federation/Makefile.mk @@ -15,4 +15,4 @@ $(test)_subscriber_sources = Subscriber.cpp Event.ice $(test)_cleanfiles = db/* 0.db/* 1.db/* 2.db/* -tests += $(test)
\ No newline at end of file +tests += $(test) diff --git a/cpp/test/IceStorm/federation2/Makefile.mk b/cpp/test/IceStorm/federation2/Makefile.mk index 93f8e4b8ad2..f4bbc702ddb 100644 --- a/cpp/test/IceStorm/federation2/Makefile.mk +++ b/cpp/test/IceStorm/federation2/Makefile.mk @@ -16,4 +16,4 @@ $(test)_subscriber_sources = Subscriber.cpp Event.ice $(test)_cleanfiles = db/* 0.db/* 1.db/* 2.db/* db2/* 0.db2/* 1.db2/* 2.db2/* -tests += $(test)
\ No newline at end of file +tests += $(test) diff --git a/cpp/test/IceStorm/rep1/Makefile.mk b/cpp/test/IceStorm/rep1/Makefile.mk index c0c73312cd6..5afbe90b98e 100644 --- a/cpp/test/IceStorm/rep1/Makefile.mk +++ b/cpp/test/IceStorm/rep1/Makefile.mk @@ -16,4 +16,4 @@ $(test)_sub_sources = Sub.cpp Single.ice $(test)_cleanfiles = 0.db/* 1.db/* 2.db/* -tests += $(test)
\ No newline at end of file +tests += $(test) diff --git a/cpp/test/IceStorm/repgrid/Makefile.mk b/cpp/test/IceStorm/repgrid/Makefile.mk index ec44f471cf9..e3dc640b632 100644 --- a/cpp/test/IceStorm/repgrid/Makefile.mk +++ b/cpp/test/IceStorm/repgrid/Makefile.mk @@ -11,4 +11,4 @@ $(test)_dependencies = IceStorm Ice TestCommon $(test)_client_sources = Client.cpp Single.ice -tests += $(test)
\ No newline at end of file +tests += $(test) diff --git a/cpp/test/IceStorm/repgrid/test.py b/cpp/test/IceStorm/repgrid/test.py index 30d8face933..2ad1de3ce79 100644 --- a/cpp/test/IceStorm/repgrid/test.py +++ b/cpp/test/IceStorm/repgrid/test.py @@ -10,4 +10,4 @@ TestSuite(__file__, [ IceGridTestCase(icegridregistry=IceGridRegistryMaster(), client=IceGridClient()) ], - runOnMainThread=True, multihost=False)
\ No newline at end of file + runOnMainThread=True, multihost=False) diff --git a/cpp/test/IceStorm/repstress/Makefile.mk b/cpp/test/IceStorm/repstress/Makefile.mk index 06630b48f47..06d5e13e423 100644 --- a/cpp/test/IceStorm/repstress/Makefile.mk +++ b/cpp/test/IceStorm/repstress/Makefile.mk @@ -16,4 +16,4 @@ $(test)_control_sources = Control.cpp Controller.ice $(test)_cleanfiles = 0.db/* 1.db/* 2.db/* -tests += $(test)
\ No newline at end of file +tests += $(test) diff --git a/cpp/test/IceStorm/single/Makefile.mk b/cpp/test/IceStorm/single/Makefile.mk index 2e8d2fdf117..bb6f102b5cf 100644 --- a/cpp/test/IceStorm/single/Makefile.mk +++ b/cpp/test/IceStorm/single/Makefile.mk @@ -13,4 +13,4 @@ $(test)_dependencies = IceStorm Ice TestCommon $(test)_publisher_sources = Publisher.cpp Single.ice $(test)_subscriber_sources = Subscriber.cpp Single.ice -tests += $(test)
\ No newline at end of file +tests += $(test) diff --git a/cpp/test/IceStorm/stress/Makefile.mk b/cpp/test/IceStorm/stress/Makefile.mk index f254df233f1..2ea1755a6de 100644 --- a/cpp/test/IceStorm/stress/Makefile.mk +++ b/cpp/test/IceStorm/stress/Makefile.mk @@ -13,4 +13,4 @@ $(test)_dependencies = IceStorm Ice TestCommon $(test)_publisher_sources = Publisher.cpp Event.ice $(test)_subscriber_sources = Subscriber.cpp Event.ice -tests += $(test)
\ No newline at end of file +tests += $(test) diff --git a/cpp/test/IceUtil/ctrlCHandler/test.py b/cpp/test/IceUtil/ctrlCHandler/test.py index d90fcc5dfa6..0a4b479c959 100644 --- a/cpp/test/IceUtil/ctrlCHandler/test.py +++ b/cpp/test/IceUtil/ctrlCHandler/test.py @@ -7,4 +7,4 @@ # # ********************************************************************** -# Dummy file to not run this test which is only ran manually.
\ No newline at end of file +# Dummy file to not run this test which is only ran manually. diff --git a/cpp/test/IceUtil/priority/TestSuite.h b/cpp/test/IceUtil/priority/TestSuite.h index 68bbfb9100d..3978c5fb3bc 100644 --- a/cpp/test/IceUtil/priority/TestSuite.h +++ b/cpp/test/IceUtil/priority/TestSuite.h @@ -18,4 +18,3 @@ extern std::list<TestBasePtr> allTests; void initializeTestSuite(); #endif - diff --git a/cpp/test/IceUtil/stacktrace/StackTrace.debug-release.OSX b/cpp/test/IceUtil/stacktrace/StackTrace.debug-release.OSX index ae24a0d3efa..b708d3c04da 100644 --- a/cpp/test/IceUtil/stacktrace/StackTrace.debug-release.OSX +++ b/cpp/test/IceUtil/stacktrace/StackTrace.debug-release.OSX @@ -5,4 +5,4 @@ 4 (anonymous namespace)::Thrower::second in client 5 (anonymous namespace)::Thrower::first in client 6 main in client - 7 start in libdyld.dylib
\ No newline at end of file + 7 start in libdyld.dylib diff --git a/cpp/test/IceUtil/stacktrace/StackTrace.debug.OSX b/cpp/test/IceUtil/stacktrace/StackTrace.debug.OSX index dcd6012dde0..04e6012104e 100644 --- a/cpp/test/IceUtil/stacktrace/StackTrace.debug.OSX +++ b/cpp/test/IceUtil/stacktrace/StackTrace.debug.OSX @@ -8,4 +8,4 @@ 7 (anonymous namespace)::Thrower::second() in client 8 (anonymous namespace)::Thrower::first() in client 9 main in client - 10 start in libdyld.dylib
\ No newline at end of file + 10 start in libdyld.dylib diff --git a/cpp/test/IceUtil/stacktrace/StackTrace.release.OSX b/cpp/test/IceUtil/stacktrace/StackTrace.release.OSX index 12c564a851b..80ea7ac63f6 100644 --- a/cpp/test/IceUtil/stacktrace/StackTrace.release.OSX +++ b/cpp/test/IceUtil/stacktrace/StackTrace.release.OSX @@ -1,3 +1,3 @@ 0 IceUtil::NullHandleException::NullHandleException(char const*, int) in libIce.3.7.0.dylib 1 main in client - 2 start in libdyld.dylib
\ No newline at end of file + 2 start in libdyld.dylib diff --git a/cpp/test/IceUtil/thread/TestSuite.h b/cpp/test/IceUtil/thread/TestSuite.h index 68bbfb9100d..3978c5fb3bc 100644 --- a/cpp/test/IceUtil/thread/TestSuite.h +++ b/cpp/test/IceUtil/thread/TestSuite.h @@ -18,4 +18,3 @@ extern std::list<TestBasePtr> allTests; void initializeTestSuite(); #endif - diff --git a/cpp/test/Slice/errorDetection/DataMemberRedefinition.err b/cpp/test/Slice/errorDetection/DataMemberRedefinition.err index 3d8e760f2c3..f423e83227b 100644 --- a/cpp/test/Slice/errorDetection/DataMemberRedefinition.err +++ b/cpp/test/Slice/errorDetection/DataMemberRedefinition.err @@ -2,4 +2,4 @@ DataMemberRedefinition.ice:18: redefinition of data member `member' as data memb DataMemberRedefinition.ice:28: data member `x' is already defined as an operation in a base interface or class DataMemberRedefinition.ice:38: operation `x' is already defined as a data member in a base interface or class DataMemberRedefinition.ice:48: data member `x' is already defined as a data member in a base interface or class -DataMemberRedefinition.ice:54: redefinition of struct member `member'
\ No newline at end of file +DataMemberRedefinition.ice:54: redefinition of struct member `member' diff --git a/cpp/test/Slice/errorDetection/DeclaratorMissing.err b/cpp/test/Slice/errorDetection/DeclaratorMissing.err index 4596788c6ee..070ea115152 100644 --- a/cpp/test/Slice/errorDetection/DeclaratorMissing.err +++ b/cpp/test/Slice/errorDetection/DeclaratorMissing.err @@ -1,4 +1,4 @@ DeclaratorMissing.ice:17: missing parameter name DeclaratorMissing.ice:17: missing parameter name DeclaratorMissing.ice:18: missing parameter name -DeclaratorMissing.ice:18: missing parameter name
\ No newline at end of file +DeclaratorMissing.ice:18: missing parameter name diff --git a/cpp/test/Slice/errorDetection/EnumeratorRedefinition.err b/cpp/test/Slice/errorDetection/EnumeratorRedefinition.err index ac120d41d16..ed5674cb9c4 100644 --- a/cpp/test/Slice/errorDetection/EnumeratorRedefinition.err +++ b/cpp/test/Slice/errorDetection/EnumeratorRedefinition.err @@ -1 +1 @@ -EnumeratorRedefinition.ice:17: redefinition of enumerator `A'
\ No newline at end of file +EnumeratorRedefinition.ice:17: redefinition of enumerator `A' diff --git a/cpp/test/Slice/errorDetection/EnumeratorValues.err b/cpp/test/Slice/errorDetection/EnumeratorValues.err index b397f349d7a..b8db9454436 100644 --- a/cpp/test/Slice/errorDetection/EnumeratorValues.err +++ b/cpp/test/Slice/errorDetection/EnumeratorValues.err @@ -2,4 +2,4 @@ EnumeratorValues.ice:17: value for enumerator `C' is out of range EnumeratorValues.ice:17: enumerator `C' has the same value as enumerator `B' EnumeratorValues.ice:18: value for enumerator `D' is out of range EnumeratorValues.ice:19: value for enumerator `E' is out of range -EnumeratorValues.ice:20: value for enumerator `F' is out of range
\ No newline at end of file +EnumeratorValues.ice:20: value for enumerator `F' is out of range diff --git a/cpp/test/Slice/errorDetection/NameCanNotBeUsed.err b/cpp/test/Slice/errorDetection/NameCanNotBeUsed.err index 442ea12e18f..22e3bcacc44 100644 --- a/cpp/test/Slice/errorDetection/NameCanNotBeUsed.err +++ b/cpp/test/Slice/errorDetection/NameCanNotBeUsed.err @@ -1,2 +1,2 @@ NameCanNotBeUsed.ice:17: class name `Foo' cannot be used as operation name -NameCanNotBeUsed.ice:23: interface name `IFoo' cannot be used as operation name
\ No newline at end of file +NameCanNotBeUsed.ice:23: interface name `IFoo' cannot be used as operation name diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsEnum.err b/cpp/test/Slice/errorDetection/RedefinitionAsEnum.err index 4765ef74dc1..a764d0eb540 100644 --- a/cpp/test/Slice/errorDetection/RedefinitionAsEnum.err +++ b/cpp/test/Slice/errorDetection/RedefinitionAsEnum.err @@ -1 +1 @@ -RedefinitionAsEnum.ice:16: redefinition of class `C' as enumeration
\ No newline at end of file +RedefinitionAsEnum.ice:16: redefinition of class `C' as enumeration diff --git a/cpp/test/Slice/errorDetection/WarningSuppressInvalidMetaData.err b/cpp/test/Slice/errorDetection/WarningSuppressInvalidMetaData.err index 8b137891791..e69de29bb2d 100644 --- a/cpp/test/Slice/errorDetection/WarningSuppressInvalidMetaData.err +++ b/cpp/test/Slice/errorDetection/WarningSuppressInvalidMetaData.err @@ -1 +0,0 @@ - diff --git a/cpp/test/Slice/headers/test.py b/cpp/test/Slice/headers/test.py index c84bbb6d79f..9349c0f8a88 100644 --- a/cpp/test/Slice/headers/test.py +++ b/cpp/test/Slice/headers/test.py @@ -150,5 +150,3 @@ class SliceHeadersTestCase(ClientTestCase): if not isinstance(platform, Windows): TestSuite(__name__, [ SliceHeadersTestCase() ], chdir=True) - - diff --git a/cpp/test/ios/controller/Classes/AppDelegate.h b/cpp/test/ios/controller/Classes/AppDelegate.h index cd554aa7ed3..bdbf2a2e808 100644 --- a/cpp/test/ios/controller/Classes/AppDelegate.h +++ b/cpp/test/ios/controller/Classes/AppDelegate.h @@ -15,4 +15,3 @@ @end - diff --git a/cpp/test/ios/controller/Classes/Assets.xcassets/AppIcon.appiconset/Contents.json b/cpp/test/ios/controller/Classes/Assets.xcassets/AppIcon.appiconset/Contents.json index ef0fccfaf08..d4e114a8919 100644 --- a/cpp/test/ios/controller/Classes/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/cpp/test/ios/controller/Classes/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -107,4 +107,4 @@ "version" : 1, "author" : "xcode" } -}
\ No newline at end of file +} diff --git a/cpp/test/ios/controller/Classes/Assets.xcassets/Contents.json b/cpp/test/ios/controller/Classes/Assets.xcassets/Contents.json index da4a164c918..2d92bd53fdb 100644 --- a/cpp/test/ios/controller/Classes/Assets.xcassets/Contents.json +++ b/cpp/test/ios/controller/Classes/Assets.xcassets/Contents.json @@ -3,4 +3,4 @@ "version" : 1, "author" : "xcode" } -}
\ No newline at end of file +} diff --git a/cpp/test/ios/controller/Classes/ViewController.h b/cpp/test/ios/controller/Classes/ViewController.h index 8267de70b65..fbadc9bc054 100644 --- a/cpp/test/ios/controller/Classes/ViewController.h +++ b/cpp/test/ios/controller/Classes/ViewController.h @@ -26,4 +26,3 @@ NSMutableArray* interfacesIPv6; } @end - diff --git a/cpp/test/uwp/controller/.gitignore b/cpp/test/uwp/controller/.gitignore index 4f40c2d1893..2fbe44d5e92 100644 --- a/cpp/test/uwp/controller/.gitignore +++ b/cpp/test/uwp/controller/.gitignore @@ -1,4 +1,4 @@ Generated\ Files Assets/Thumbs.db Controller.cpp -Controller.h
\ No newline at end of file +Controller.h diff --git a/cpp/test/uwp/controller/Package.appxmanifest b/cpp/test/uwp/controller/Package.appxmanifest index 75370784c37..e5a1aa1d6f5 100644 --- a/cpp/test/uwp/controller/Package.appxmanifest +++ b/cpp/test/uwp/controller/Package.appxmanifest @@ -35,4 +35,4 @@ </Certificates> </Extension> </Extensions> -</Package>
\ No newline at end of file +</Package> |