diff options
| author | Joe George <joe@zeroc.com> | 2017-06-07 16:39:31 -0400 |
|---|---|---|
| committer | Joe George <joe@zeroc.com> | 2017-06-07 16:39:31 -0400 |
| commit | 2fb970cdea450b15b5f7d74099246b6abef16857 (patch) | |
| tree | ac0fdf40cff12d1cba313e20da757671cbdeeebd | |
| parent | Remove trailing whitespace (diff) | |
| download | ice-2fb970cdea450b15b5f7d74099246b6abef16857.tar.bz2 ice-2fb970cdea450b15b5f7d74099246b6abef16857.tar.xz ice-2fb970cdea450b15b5f7d74099246b6abef16857.zip | |
Remove excessive empty lines
522 files changed, 0 insertions, 937 deletions
diff --git a/CHANGELOG-3.4.md b/CHANGELOG-3.4.md index 8a133fd8279..a2c508ec1e8 100644 --- a/CHANGELOG-3.4.md +++ b/CHANGELOG-3.4.md @@ -945,7 +945,6 @@ These are changes since Ice 3.3.1. - 64-bit integers are now supported in buffer types. - ## Ruby Changes - Fixed a compilation error when using Ruby 1.8.7 (patch level >= diff --git a/certs/makecerts.py b/certs/makecerts.py index a289e0c9ab0..734556f31cf 100755 --- a/certs/makecerts.py +++ b/certs/makecerts.py @@ -128,5 +128,4 @@ except Exception as ex: print("warning: couldn't generate JKS certificates for Java applications:\n" + str(ex)) print("Please fix this issue if you want to run the Java tests.") - factory.destroy() diff --git a/config/Make.project.rules b/config/Make.project.rules index 73bd5ac93ce..a2f15044147 100644 --- a/config/Make.project.rules +++ b/config/Make.project.rules @@ -201,7 +201,6 @@ $1/%.cpp: $1/%.l @$(RM) $$@.tail endef - # # $(call make-static-library,$1=libname,$2=libdir,$3=version,$4=soversion,$5=objects,$6=dependencies,$7=ldflags, # $8=platform,$9=config) diff --git a/config/Make.rules.Linux b/config/Make.rules.Linux index b9c8d27f2c3..2d86ff85f40 100644 --- a/config/Make.rules.Linux +++ b/config/Make.rules.Linux @@ -117,7 +117,6 @@ ifeq ($(OPTIMIZE),yes) endif endif - build-platform = $(if $(filter arm%,$(shell uname -m)),arm,$(shell uname -m)) supported-platforms = $(build-platform) lib-suffix = $(if $(filter x86_64,$(build-platform)),64,) @@ -167,7 +166,6 @@ mkshlibname = lib$(1).so # Clear the iconv ldflags, iconv is part of libc on Linux iconv_ldflags := - # # With GCC < 6.1, libbacktrace crash with a SEGV for -pie exes linked with debug-stripped libs # See https://gcc.gnu.org/ml/gcc-patches/2016-03/msg00132.html diff --git a/config/makeprops.py b/config/makeprops.py index 8927d5f9c53..232c18be88d 100755 --- a/config/makeprops.py +++ b/config/makeprops.py @@ -481,7 +481,6 @@ class JavaCompatPropertyHandler(JavaPropertyHandler): os.remove(os.path.join(dest, self.className + ".java")) shutil.move(self.className + "-compat.java", os.path.join(dest, self.className + ".java")) - class CSPropertyHandler(PropertyHandler): def __init__(self, inputfile, c): PropertyHandler.__init__(self, inputfile, c) diff --git a/cpp/config/ice_ca.cnf b/cpp/config/ice_ca.cnf index be731806232..576376f4897 100644 --- a/cpp/config/ice_ca.cnf +++ b/cpp/config/ice_ca.cnf @@ -18,13 +18,11 @@ [ ca ] default_ca = ice - [ ice ] default_days = 365 # How long certs are valid. default_md = md5 # The Message Digest type. preserve = no # Keep passed DN ordering? - [ req ] default_bits = 2048 default_keyfile = $ENV::ICE_HOME/certs/ca/cakey.pem @@ -33,7 +31,6 @@ prompt = no distinguished_name = root_ca_distinguished_name x509_extensions = root_ca_extensions - [ root_ca_distinguished_name ] countryName = US stateOrProvinceName = Some State @@ -43,7 +40,6 @@ organizationalUnitName = Development commonName = Your Certificate Authority emailAddress = you@some.net - [ root_ca_extensions ] basicConstraints = CA:true diff --git a/cpp/config/templates.xml b/cpp/config/templates.xml index c8e0d62ee90..7c56a3310df 100644 --- a/cpp/config/templates.xml +++ b/cpp/config/templates.xml @@ -32,7 +32,6 @@ </server-template> - <server-template id="Glacier2"> <parameter name="instance-name" default="${application}.Glacier2"/> @@ -51,7 +50,6 @@ </server-template> - <service-template id="IceStorm"> <parameter name="instance-name" default="${application}.IceStorm"/> @@ -78,7 +76,6 @@ </service-template> - <server-template id="IceStorm"> <parameter name="instance-name" default="${application}.IceStorm"/> @@ -96,7 +93,6 @@ </server-template> - <service-template id="IceStorm-HA"> <parameter name="instance-name" default="${application}.IceStorm"/> @@ -132,7 +128,6 @@ </service-template> - <server-template id="IceStorm-HA"> <parameter name="instance-name" default="${application}.IceStorm"/> diff --git a/cpp/include/Ice/CommunicatorAsync.h b/cpp/include/Ice/CommunicatorAsync.h index 4dcbb9d4310..12b5068352e 100644 --- a/cpp/include/Ice/CommunicatorAsync.h +++ b/cpp/include/Ice/CommunicatorAsync.h @@ -49,7 +49,6 @@ public: } }; - template<class T> Callback_Communicator_flushBatchRequestsPtr newCallback_Communicator_flushBatchRequests(const IceUtil::Handle<T>& instance, void (T::*excb)(const ::Ice::Exception&), diff --git a/cpp/include/Ice/Exception.h b/cpp/include/Ice/Exception.h index 387477e2cdb..cb50bd2a9c1 100644 --- a/cpp/include/Ice/Exception.h +++ b/cpp/include/Ice/Exception.h @@ -50,7 +50,6 @@ public: static const std::string& ice_staticId(); }; - // // Base class for all Ice user exceptions // @@ -77,7 +76,6 @@ protected: virtual void _readImpl(::Ice::InputStream*) {} }; - // // Base class for all Ice system exceptions // diff --git a/cpp/include/Ice/FactoryTableInit.h b/cpp/include/Ice/FactoryTableInit.h index 00afef7c91c..6fc9647924b 100644 --- a/cpp/include/Ice/FactoryTableInit.h +++ b/cpp/include/Ice/FactoryTableInit.h @@ -28,7 +28,6 @@ static FactoryTableInit factoryTableInitializer; // Dummy variable to force i extern ICE_API FactoryTable* factoryTable; - class ICE_API CompactIdInit { public: diff --git a/cpp/include/Ice/IncomingAsync.h b/cpp/include/Ice/IncomingAsync.h index 5df41c0ed83..b9e5d34ba25 100644 --- a/cpp/include/Ice/IncomingAsync.h +++ b/cpp/include/Ice/IncomingAsync.h @@ -23,7 +23,6 @@ public: virtual ~AMDCallback(); - virtual void ice_exception(const ::std::exception&) = 0; virtual void ice_exception() = 0; }; diff --git a/cpp/include/Ice/Initialize.h b/cpp/include/Ice/Initialize.h index 83e36938dc4..0c3508823b1 100644 --- a/cpp/include/Ice/Initialize.h +++ b/cpp/include/Ice/Initialize.h @@ -137,7 +137,6 @@ inline CommunicatorPtr initialize(int& argc, char* argv[], const InitializationD return initialize(argc, const_cast<const char**>(argv), initData, version); } - ICE_API CommunicatorPtr initialize(int&, const char*[], ICE_CONFIG_FILE_STRING, int = ICE_INT_VERSION); inline CommunicatorPtr initialize(int& argc, char* argv[], ICE_CONFIG_FILE_STRING configFile, int version = ICE_INT_VERSION) @@ -172,7 +171,6 @@ ICE_API CommunicatorPtr initialize(const InitializationData& = InitializationDat ICE_API CommunicatorPtr initialize(ICE_CONFIG_FILE_STRING, int = ICE_INT_VERSION); - ICE_API LoggerPtr getProcessLogger(); ICE_API void setProcessLogger(const LoggerPtr&); diff --git a/cpp/include/Ice/InputStream.h b/cpp/include/Ice/InputStream.h index 8eaf708ea0c..b2cba30b20e 100644 --- a/cpp/include/Ice/InputStream.h +++ b/cpp/include/Ice/InputStream.h @@ -942,7 +942,6 @@ private: Encaps* previous; }; - // // Optimization. The instance may not be deleted while a // stack-allocated stream still holds it. diff --git a/cpp/include/Ice/MetricsAdminI.h b/cpp/include/Ice/MetricsAdminI.h index a76a74db305..1ea7fe8d3eb 100644 --- a/cpp/include/Ice/MetricsAdminI.h +++ b/cpp/include/Ice/MetricsAdminI.h @@ -251,7 +251,6 @@ public: private: - IceMX::MetricsFailures getFailures() const { @@ -386,7 +385,6 @@ public: return IceMX::MetricsFailures(); } - std::pair<MetricsMapIPtr, SubMapMember> createSubMap(const std::string& subMapName) { diff --git a/cpp/include/Ice/MetricsObserverI.h b/cpp/include/Ice/MetricsObserverI.h index 7a3710cd2bc..2a610ccb4c7 100644 --- a/cpp/include/Ice/MetricsObserverI.h +++ b/cpp/include/Ice/MetricsObserverI.h @@ -170,7 +170,6 @@ protected: Y (Helper::*_memberFn)() const; }; - template<typename I, typename O, typename Y> class MemberResolver : public Resolver { public: diff --git a/cpp/include/Ice/Optional.h b/cpp/include/Ice/Optional.h index fa854400e70..f96405917ea 100644 --- a/cpp/include/Ice/Optional.h +++ b/cpp/include/Ice/Optional.h @@ -94,7 +94,6 @@ # define OPTIONAL_HAS_THIS_RVALUE_REFS 0 # endif - # if defined TR2_OPTIONAL_GCC_4_8_1_AND_HIGHER___ # define OPTIONAL_HAS_CONSTEXPR_INIT_LIST 1 # define OPTIONAL_CONSTEXPR_INIT_LIST constexpr @@ -151,7 +150,6 @@ namespace Ice{ // leave it: the user doesn't want it # else - // workaround for missing traits in GCC and CLANG template <class T> struct is_nothrow_move_constructible @@ -159,7 +157,6 @@ struct is_nothrow_move_constructible constexpr static bool value = std::is_nothrow_constructible<T, T&&>::value; }; - template <class T, class U> struct is_assignable { @@ -173,7 +170,6 @@ struct is_assignable constexpr static bool value = has_assign<T, U>(true); }; - template <class T> struct is_nothrow_move_assignable { @@ -191,18 +187,14 @@ struct is_nothrow_move_assignable }; // end workaround - # endif - - // 20.5.4, optional for object types template <class T> class optional; // 20.5.5, optional for lvalue reference types template <class T> class optional<T&>; - // workaround: std utility functions aren't constexpr yet template <class T> inline constexpr T&& constexpr_forward(typename std::remove_reference<T>::type& t) noexcept { @@ -220,14 +212,12 @@ template <class T> inline constexpr typename std::remove_reference<T>::type&& co return static_cast<typename std::remove_reference<T>::type&&>(t); } - #if defined NDEBUG # define TR2_OPTIONAL_ASSERTED_EXPRESSION(CHECK, EXPR) (EXPR) #else # define TR2_OPTIONAL_ASSERTED_EXPRESSION(CHECK, EXPR) ((CHECK) ? (EXPR) : ([]{assert(!#CHECK);}(), (EXPR))) #endif - namespace detail_ { @@ -256,21 +246,17 @@ T* static_addressof(T& ref) return std::addressof(ref); } - // the call to convert<A>(b) has return type A and converts b to type A iff b decltype(b) is implicitly convertible to A template <class U> constexpr U convert(U v) { return v; } } // namespace detail - constexpr struct trivial_init_t{} trivial_init{}; - // 20.5.6, In-place construction constexpr struct in_place_t{} in_place{}; - // 20.5.7, Disengaged state indicator struct nullopt_t { @@ -279,7 +265,6 @@ struct nullopt_t }; constexpr nullopt_t nullopt{nullopt_t::init()}; - // 20.5.8, class bad_optional_access class bad_optional_access : public logic_error { public: @@ -287,7 +272,6 @@ public: explicit bad_optional_access(const char* what_arg) : logic_error{what_arg} {} }; - template <class T> union storage_t { @@ -302,7 +286,6 @@ union storage_t ~storage_t(){} }; - template <class T> union constexpr_storage_t { @@ -317,7 +300,6 @@ union constexpr_storage_t ~constexpr_storage_t() = default; }; - template <class T> struct optional_base { @@ -340,7 +322,6 @@ struct optional_base ~optional_base() { if (init_) storage_.value_.T::~T(); } }; - template <class T> struct constexpr_optional_base { @@ -370,15 +351,12 @@ using OptionalBase = typename std::conditional< optional_base<typename std::remove_const<T>::type> >::type; - - template <class T> class optional : private OptionalBase<T> { static_assert( !std::is_same<typename std::decay<T>::type, nullopt_t>::value, "bad T" ); static_assert( !std::is_same<typename std::decay<T>::type, in_place_t>::value, "bad T" ); - constexpr bool initialized() const noexcept { return OptionalBase<T>::init_; } typename std::remove_const<T>::type* dataptr() { return std::addressof(OptionalBase<T>::storage_.value_); } constexpr const T* dataptr() const { return detail_::static_addressof(OptionalBase<T>::storage_.value_); } @@ -495,7 +473,6 @@ public: return *this; } - template <class... Args> void emplace(Args&&... args) { @@ -627,7 +604,6 @@ public: void reset() noexcept { clear(); } }; - template <class T> class optional<T&> { @@ -697,7 +673,6 @@ public: void emplace(T&&) = delete; - void swap(optional<T&>& rhs) noexcept { std::swap(ref, rhs.ref); @@ -734,14 +709,12 @@ public: void reset() noexcept { ref = nullptr; } }; - template <class T> class optional<T&&> { static_assert( sizeof(T) == 0, "optional rvalue references disallowed" ); }; - // 20.5.8, Relational operators template <class T> constexpr bool operator==(const optional<T>& x, const optional<T>& y) { @@ -773,7 +746,6 @@ template <class T> constexpr bool operator>=(const optional<T>& x, const optiona return !(x < y); } - // 20.5.9, Comparison with nullopt template <class T> constexpr bool operator==(const optional<T>& x, nullopt_t) noexcept { @@ -835,8 +807,6 @@ template <class T> constexpr bool operator>=(nullopt_t, const optional<T>& x) no return (!x); } - - // 20.5.10, Comparison with T template <class T> constexpr bool operator==(const optional<T>& x, const T& v) { @@ -898,7 +868,6 @@ template <class T> constexpr bool operator>=(const T& v, const optional<T>& x) return bool(x) ? v >= *x : true; } - // Comparison of optional<T&> with T template <class T> constexpr bool operator==(const optional<T&>& x, const T& v) { @@ -1021,7 +990,6 @@ template <class T> constexpr bool operator>=(const T& v, const optional<const T& return bool(x) ? v >= *x : true; } - // 20.5.12, Specialized algorithms template <class T> void swap(optional<T>& x, optional<T>& y) noexcept(noexcept(x.swap(y))) @@ -1029,7 +997,6 @@ void swap(optional<T>& x, optional<T>& y) noexcept(noexcept(x.swap(y))) x.swap(y); } - template <class T> constexpr optional<typename decay<T>::type> make_optional(T&& v) { diff --git a/cpp/include/Ice/Proxy.h b/cpp/include/Ice/Proxy.h index c50d9fa8b28..ae42ca8d382 100644 --- a/cpp/include/Ice/Proxy.h +++ b/cpp/include/Ice/Proxy.h @@ -418,7 +418,6 @@ public: return ::Ice::Object::ice_staticId(); } - // // ice_invoke with default vector mapping for byte-sequence parameters // @@ -466,7 +465,6 @@ public: return [outAsync]() { outAsync->cancel(); }; } - // // ice_invoke with cpp:array mapping for byte sequence parameters // @@ -526,7 +524,6 @@ public: return [outAsync]() { outAsync->cancel(); }; } - ::Ice::Identity ice_getIdentity() const; ::std::shared_ptr<::Ice::ObjectPrx> ice_identity(const ::Ice::Identity&) const; @@ -1087,7 +1084,6 @@ public: return _iceI_begin_ice_ping(context, del, cookie); } - ::Ice::AsyncResultPtr begin_ice_ping(const ::Ice::Callback_Object_ice_pingPtr& del, const ::Ice::LocalObjectPtr& cookie = 0) { @@ -1183,7 +1179,6 @@ public: return ::Ice::Object::ice_staticId(); } - // Returns true if ok, false if user exception. bool ice_invoke(const ::std::string&, ::Ice::OperationMode, @@ -1723,7 +1718,6 @@ inline bool operator>=(const ProxyHandle<T>& lhs, const ProxyHandle<U>& rhs) return !(lhs < rhs); } - // // checkedCast and uncheckedCast functions without facet: // @@ -2523,7 +2517,6 @@ public: { } - virtual void completed(const ::Ice::AsyncResultPtr& result) const { ::Ice::ConnectionPtr ret; diff --git a/cpp/include/Ice/StreamHelpers.h b/cpp/include/Ice/StreamHelpers.h index f9cc3f0b48c..e4ef705b605 100644 --- a/cpp/include/Ice/StreamHelpers.h +++ b/cpp/include/Ice/StreamHelpers.h @@ -305,7 +305,6 @@ struct StreamableTraits< ::std::vector<bool> > static const bool fixedLength = false; }; - #ifdef ICE_CPP11_MAPPING template<typename T> struct StreamableTraits<::std::shared_ptr<T>, typename ::std::enable_if<::std::is_base_of<::Ice::ObjectPrx, T>::value>::type> @@ -350,7 +349,6 @@ struct StreamableTraits< ::IceInternal::Handle<T> > template<typename T, StreamHelperCategory st> struct StreamHelper; - // Helper for builtins, delegates read/write to the stream. template<typename T> struct StreamHelper<T, StreamHelperCategoryBuiltin> @@ -555,7 +553,6 @@ struct StreamHelper<std::pair<IceUtil::ScopedArray<T>, std::pair<const T*, const }; #endif - // Helper for dictionaries template<typename T> struct StreamHelper<T, StreamHelperCategoryDictionary> @@ -633,7 +630,6 @@ struct StreamHelper<T, StreamHelperCategoryClass> } }; - // // Helpers to read/write optional attributes or members. // @@ -689,7 +685,6 @@ struct GetOptionalFormat<StreamHelperCategoryEnum, minWireSize, false> static const OptionalFormat value = ICE_SCOPED_ENUM(OptionalFormat, Size); }; - // Base helper: simply read/write the data template<typename T, StreamHelperCategory st, bool fixedLength> struct StreamOptionalHelper @@ -771,7 +766,6 @@ struct StreamOptionalHelper<T, StreamHelperCategoryProxy, false> : StreamOptiona { }; - // // Helpers to read/write optional sequences or dictionaries // @@ -856,7 +850,6 @@ struct StreamOptionalContainerHelper<T, true, 1> } }; - // // Helper to write sequences, delegates to the optional container // helper template partial specializations. diff --git a/cpp/include/IceSSL/Plugin.h b/cpp/include/IceSSL/Plugin.h index fecebc76975..0bfc483a09a 100644 --- a/cpp/include/IceSSL/Plugin.h +++ b/cpp/include/IceSSL/Plugin.h @@ -372,7 +372,6 @@ public: static CertificatePtr decode(const std::string&); }; - #ifndef ICE_CPP11_MAPPING // C++98 mapping // // An application can customize the certificate verification process diff --git a/cpp/include/IceUtil/Atomic.h b/cpp/include/IceUtil/Atomic.h index 9d5da29dbef..c3c7c3e792e 100644 --- a/cpp/include/IceUtil/Atomic.h +++ b/cpp/include/IceUtil/Atomic.h @@ -41,7 +41,6 @@ # include <IceUtil/Mutex.h> #endif - namespace IceUtilInternal { @@ -63,7 +62,6 @@ typedef unsigned int ATOMIC_T; typedef int ATOMIC_T; #endif - // // This is temporary and very partial placeholder for std::atomic, // which is not yet widely available. diff --git a/cpp/include/IceUtil/Cond.h b/cpp/include/IceUtil/Cond.h index 439e8c7f913..7e853d3dd99 100644 --- a/cpp/include/IceUtil/Cond.h +++ b/cpp/include/IceUtil/Cond.h @@ -40,7 +40,6 @@ private: } #endif - namespace IceUtil { diff --git a/cpp/include/IceUtil/Config.h b/cpp/include/IceUtil/Config.h index 1bea31aa558..900e27fbab4 100644 --- a/cpp/include/IceUtil/Config.h +++ b/cpp/include/IceUtil/Config.h @@ -116,7 +116,6 @@ # error "you need a C++11 capable compiler to use the C++11 mapping" #endif - #if defined(ICE_CPP11_COMPILER) && (!defined(_MSC_VER) || (_MSC_VER >= 1900)) # define ICE_NOEXCEPT noexcept # define ICE_NOEXCEPT_FALSE noexcept(false) @@ -125,7 +124,6 @@ # define ICE_NOEXCEPT_FALSE /**/ #endif - // // Does the C++ compiler library provide std::codecvt_utf8 and // std::codecvt_utf8_utf16? @@ -335,7 +333,6 @@ private: const noncopyable& operator=(const noncopyable&); }; - typedef unsigned char Byte; // diff --git a/cpp/include/IceUtil/DisableWarnings.h b/cpp/include/IceUtil/DisableWarnings.h index 4c8bb525be5..7d578566da4 100644 --- a/cpp/include/IceUtil/DisableWarnings.h +++ b/cpp/include/IceUtil/DisableWarnings.h @@ -33,7 +33,6 @@ # endif #endif - // // GCC // @@ -48,5 +47,4 @@ # pragma clang diagnostic ignored "-Wdeprecated-declarations" #endif - #endif diff --git a/cpp/include/IceUtil/Exception.h b/cpp/include/IceUtil/Exception.h index 759818da858..c2b556be1ea 100644 --- a/cpp/include/IceUtil/Exception.h +++ b/cpp/include/IceUtil/Exception.h @@ -59,7 +59,6 @@ private: ICE_API std::ostream& operator<<(std::ostream&, const Exception&); - #ifdef ICE_CPP11_MAPPING template<typename E, typename B = Exception> @@ -110,7 +109,6 @@ public: #endif - class ICE_API NullHandleException : public ExceptionHelper<NullHandleException> { public: @@ -176,7 +174,6 @@ private: const std::string _reason; }; - class ICE_API SyscallException : public ExceptionHelper<SyscallException> { public: @@ -201,7 +198,6 @@ private: const int _error; }; - #ifdef ICE_CPP11_MAPPING template<typename E> @@ -227,7 +223,6 @@ public: #endif - class ICE_API FileLockException : public ExceptionHelper<FileLockException> { public: diff --git a/cpp/include/IceUtil/Lock.h b/cpp/include/IceUtil/Lock.h index 943a816d46c..f6e1277bd3d 100644 --- a/cpp/include/IceUtil/Lock.h +++ b/cpp/include/IceUtil/Lock.h @@ -21,7 +21,6 @@ namespace IceUtil // class Cond; - // LockT and TryLockT are the preferred construct to lock/tryLock/unlock // simple and recursive mutexes. You typically allocate them on the // stack to hold a lock on a mutex. @@ -68,7 +67,6 @@ public: _acquired = true; } - bool tryAcquire() const { if (_acquired) diff --git a/cpp/include/IceUtil/Monitor.h b/cpp/include/IceUtil/Monitor.h index 36004ca01eb..293a497fbc9 100644 --- a/cpp/include/IceUtil/Monitor.h +++ b/cpp/include/IceUtil/Monitor.h @@ -215,7 +215,6 @@ IceUtil::Monitor<T>::notifyAll() _nnotify = -1; } - template <class T> inline void IceUtil::Monitor<T>::notifyImpl(int nnotify) const { diff --git a/cpp/include/IceUtil/RecMutex.h b/cpp/include/IceUtil/RecMutex.h index 11b8b2474e6..d574ee6220c 100644 --- a/cpp/include/IceUtil/RecMutex.h +++ b/cpp/include/IceUtil/RecMutex.h @@ -53,7 +53,6 @@ public: // bool tryLock() const; - void unlock() const; // diff --git a/cpp/include/IceUtil/ScannerConfig.h b/cpp/include/IceUtil/ScannerConfig.h index f74190344e6..4bfb8b92c46 100644 --- a/cpp/include/IceUtil/ScannerConfig.h +++ b/cpp/include/IceUtil/ScannerConfig.h @@ -33,5 +33,4 @@ # pragma clang diagnostic ignored "-Wdeprecated-register" #endif - #endif diff --git a/cpp/include/IceUtil/ScopedArray.h b/cpp/include/IceUtil/ScopedArray.h index 21aa7e7702e..3cc9186a940 100644 --- a/cpp/include/IceUtil/ScopedArray.h +++ b/cpp/include/IceUtil/ScopedArray.h @@ -66,7 +66,6 @@ public: return *this; } - T& operator[](size_t i) const { assert(_ptr != 0); diff --git a/cpp/include/IceUtil/StringConverter.h b/cpp/include/IceUtil/StringConverter.h index 20ddb92519e..c581b5c595d 100644 --- a/cpp/include/IceUtil/StringConverter.h +++ b/cpp/include/IceUtil/StringConverter.h @@ -106,7 +106,6 @@ ICE_API WstringConverterPtr getProcessWstringConverter(); // ICE_API void setProcessWstringConverter(const WstringConverterPtr&); - // // Converts the given wide string to a narrow string // @@ -133,7 +132,6 @@ stringToWstring(const std::string&, const StringConverterPtr& = 0, const WstringConverterPtr& = 0); - // // Converts the given string from the native narrow string encoding to // UTF-8 using the given converter. If the converter is null, returns diff --git a/cpp/include/IceUtil/Timer.h b/cpp/include/IceUtil/Timer.h index bd5a946ee57..5138913956e 100644 --- a/cpp/include/IceUtil/Timer.h +++ b/cpp/include/IceUtil/Timer.h @@ -55,7 +55,6 @@ public: // Timer(); - // // Construct a timer and starts its execution thread with the priority. // diff --git a/cpp/msbuild/ice.cpp.props b/cpp/msbuild/ice.cpp.props index 5ff1bc00328..54cf422d786 100644 --- a/cpp/msbuild/ice.cpp.props +++ b/cpp/msbuild/ice.cpp.props @@ -240,7 +240,6 @@ </Otherwise> </Choose> - <!-- Workaround to avoid annoying warnings from Nuget restore. --> diff --git a/cpp/src/Glacier2/FilterManager.cpp b/cpp/src/Glacier2/FilterManager.cpp index a577e32ac61..3231ccbcd8a 100644 --- a/cpp/src/Glacier2/FilterManager.cpp +++ b/cpp/src/Glacier2/FilterManager.cpp @@ -15,7 +15,6 @@ #include <Glacier2/FilterManager.h> #include <Glacier2/FilterI.h> - using namespace std; using namespace Ice; diff --git a/cpp/src/Glacier2/Glacier2Router.cpp b/cpp/src/Glacier2/Glacier2Router.cpp index 2f23bd6d21b..98242f8eef0 100644 --- a/cpp/src/Glacier2/Glacier2Router.cpp +++ b/cpp/src/Glacier2/Glacier2Router.cpp @@ -46,7 +46,6 @@ private: SessionRouterIPtr _sessionRouter; }; - class FinderI : public Ice::RouterFinder { public: diff --git a/cpp/src/Glacier2/ProxyVerifier.cpp b/cpp/src/Glacier2/ProxyVerifier.cpp index 1ecdd5c076f..9df5d0be407 100644 --- a/cpp/src/Glacier2/ProxyVerifier.cpp +++ b/cpp/src/Glacier2/ProxyVerifier.cpp @@ -434,7 +434,6 @@ public: } }; - // // AddressMatcher factories abstract away the logic of which matching // objects need to be created depending on the state of the filter diff --git a/cpp/src/Glacier2/RequestQueue.h b/cpp/src/Glacier2/RequestQueue.h index bc7e6f648bd..69c05a1d180 100644 --- a/cpp/src/Glacier2/RequestQueue.h +++ b/cpp/src/Glacier2/RequestQueue.h @@ -96,7 +96,6 @@ private: }; typedef IceUtil::Handle<RequestQueue> RequestQueuePtr; - class RequestQueueThread : public IceUtil::Thread, public IceUtil::Monitor<IceUtil::Mutex> { public: diff --git a/cpp/src/Glacier2/SessionRouterI.cpp b/cpp/src/Glacier2/SessionRouterI.cpp index cd150de5fa2..0172d4ee35f 100644 --- a/cpp/src/Glacier2/SessionRouterI.cpp +++ b/cpp/src/Glacier2/SessionRouterI.cpp @@ -232,7 +232,6 @@ public: { } - void checkPermissionsResponse(bool ok, const string& reason) { diff --git a/cpp/src/Glacier2/SessionRouterI.h b/cpp/src/Glacier2/SessionRouterI.h index 60392fb8de0..98ad5a6a8a1 100644 --- a/cpp/src/Glacier2/SessionRouterI.h +++ b/cpp/src/Glacier2/SessionRouterI.h @@ -21,7 +21,6 @@ #include <set> - namespace Glacier2 { diff --git a/cpp/src/Glacier2CryptPermissionsVerifier/CryptPermissionsVerifierI.cpp b/cpp/src/Glacier2CryptPermissionsVerifier/CryptPermissionsVerifierI.cpp index 68666b9531a..c59b2d386e6 100644 --- a/cpp/src/Glacier2CryptPermissionsVerifier/CryptPermissionsVerifierI.cpp +++ b/cpp/src/Glacier2CryptPermissionsVerifier/CryptPermissionsVerifierI.cpp @@ -136,10 +136,8 @@ private: R _ref; }; - #endif - class CryptPermissionsVerifierI : public PermissionsVerifier { public: @@ -168,7 +166,6 @@ private: CommunicatorPtr _communicator; }; - map<string, string> retrievePasswordMap(const string& file) { @@ -508,7 +505,6 @@ CryptPermissionsVerifierI::checkPermissions(const string& userId, const string& #endif } - CryptPermissionsVerifierPlugin::CryptPermissionsVerifierPlugin(const CommunicatorPtr& communicator) : _communicator(communicator) { diff --git a/cpp/src/Glacier2Lib/Application.cpp b/cpp/src/Glacier2Lib/Application.cpp index 43b0d091efe..817502df9da 100644 --- a/cpp/src/Glacier2Lib/Application.cpp +++ b/cpp/src/Glacier2Lib/Application.cpp @@ -106,7 +106,6 @@ Glacier2::Application::restart() throw RestartSessionException(); } - Glacier2::RouterPrxPtr Glacier2::Application::router() { diff --git a/cpp/src/Glacier2Lib/SessionHelper.cpp b/cpp/src/Glacier2Lib/SessionHelper.cpp index 4b781be2ea1..be80106633f 100644 --- a/cpp/src/Glacier2Lib/SessionHelper.cpp +++ b/cpp/src/Glacier2Lib/SessionHelper.cpp @@ -73,7 +73,6 @@ public: { } - virtual void run() { @@ -303,13 +302,11 @@ SessionHelperI::objectAdapter() return internalObjectAdapter(); } - Glacier2::SessionHelper::~SessionHelper() { // Out of line to avoid weak vtable } - #ifndef ICE_CPP11_MAPPING bool Glacier2::SessionHelper::operator==(const Glacier2::SessionHelper& other) const @@ -344,7 +341,6 @@ Glacier2::SessionCallback::~SessionCallback() // Out of line to avoid weak vtable } - namespace { @@ -621,7 +617,6 @@ private: const string _finder; }; - class DispatchCallThread : public IceUtil::Thread { diff --git a/cpp/src/Ice/ACM.cpp b/cpp/src/Ice/ACM.cpp index 6cdec20d8f7..238791edfa1 100644 --- a/cpp/src/Ice/ACM.cpp +++ b/cpp/src/Ice/ACM.cpp @@ -210,7 +210,6 @@ IceInternal::FactoryACMMonitor::runTimerTask() } } - // // Monitor connections outside the thread synchronization, so // that connections can be added or removed during monitoring. diff --git a/cpp/src/Ice/Acceptor.cpp b/cpp/src/Ice/Acceptor.cpp index a48d1f72907..35c48e70d4d 100644 --- a/cpp/src/Ice/Acceptor.cpp +++ b/cpp/src/Ice/Acceptor.cpp @@ -13,11 +13,9 @@ using namespace std; using namespace Ice; using namespace IceInternal; - Acceptor::~Acceptor() { // Out of line to avoid weak vtable } - IceUtil::Shared* IceInternal::upCast(Acceptor* p) { return p; } diff --git a/cpp/src/Ice/ConnectRequestHandler.cpp b/cpp/src/Ice/ConnectRequestHandler.cpp index 47c26f53da2..b201a5c1c30 100644 --- a/cpp/src/Ice/ConnectRequestHandler.cpp +++ b/cpp/src/Ice/ConnectRequestHandler.cpp @@ -192,7 +192,6 @@ ConnectRequestHandler::setException(const Ice::LocalException& ex) // Ignore } - for(deque<ProxyOutgoingAsyncBasePtr>::const_iterator p = _requests.begin(); p != _requests.end(); ++p) { if((*p)->exception(ex)) diff --git a/cpp/src/Ice/ConnectionI.cpp b/cpp/src/Ice/ConnectionI.cpp index 2eb66ff7d0a..e65b877e718 100644 --- a/cpp/src/Ice/ConnectionI.cpp +++ b/cpp/src/Ice/ConnectionI.cpp @@ -294,7 +294,6 @@ Ice::ConnectionI::Observer::attach(const Ice::Instrumentation::ConnectionObserve } } - void Ice::ConnectionI::OutgoingMessage::adopt(OutputStream* str) { @@ -2083,7 +2082,6 @@ Ice::ConnectionI::finish(bool close) #endif } - for(deque<OutgoingMessage>::iterator o = _sendStreams.begin(); o != _sendStreams.end(); ++o) { o->completed(*_exception); diff --git a/cpp/src/Ice/ConnectionI.h b/cpp/src/Ice/ConnectionI.h index 928cc298d00..19235b4e71a 100644 --- a/cpp/src/Ice/ConnectionI.h +++ b/cpp/src/Ice/ConnectionI.h @@ -126,7 +126,6 @@ public: #endif }; - #ifdef ICE_CPP11_MAPPING class StartCallback { @@ -175,7 +174,6 @@ public: IceInternal::BatchRequestQueuePtr getBatchRequestQueue() const; - #ifdef ICE_CPP11_MAPPING virtual std::function<void()> flushBatchRequestsAsync(CompressBatch, diff --git a/cpp/src/Ice/EndpointI.cpp b/cpp/src/Ice/EndpointI.cpp index c1fa1a620b0..7fa0d7ae420 100644 --- a/cpp/src/Ice/EndpointI.cpp +++ b/cpp/src/Ice/EndpointI.cpp @@ -17,7 +17,6 @@ IceUtil::Shared* IceInternal::upCast(EndpointI* p) { return p; } IceUtil::Shared* IceInternal::upCast(EndpointI_connectors* p) { return p; } #endif - IceInternal::EndpointI_connectors::~EndpointI_connectors() { // Out of line to avoid weak vtable diff --git a/cpp/src/Ice/EndpointI.h b/cpp/src/Ice/EndpointI.h index 8ff79a80b3a..9fd977a1be9 100644 --- a/cpp/src/Ice/EndpointI.h +++ b/cpp/src/Ice/EndpointI.h @@ -218,7 +218,6 @@ private: const EndpointIPtr _endpoint; }; - } #endif diff --git a/cpp/src/Ice/Exception.cpp b/cpp/src/Ice/Exception.cpp index 9533739fdde..9faa0bddc71 100644 --- a/cpp/src/Ice/Exception.cpp +++ b/cpp/src/Ice/Exception.cpp @@ -350,7 +350,6 @@ Ice::IllegalServantException::ice_print(ostream& out) const out << ":\nillegal servant: `" << reason << "'"; } - static void printFailedRequestData(ostream& out, const RequestFailedException& ex) { @@ -476,7 +475,6 @@ Ice::OperationInterruptedException::ice_print(ostream& out) const out << ":\noperation interrupted"; } - void Ice::TimeoutException::ice_print(ostream& out) const { diff --git a/cpp/src/Ice/FactoryTableInit.cpp b/cpp/src/Ice/FactoryTableInit.cpp index cdc0cdfda54..2f3b286974a 100644 --- a/cpp/src/Ice/FactoryTableInit.cpp +++ b/cpp/src/Ice/FactoryTableInit.cpp @@ -80,7 +80,6 @@ IceInternal::FactoryTableInit::~FactoryTableInit() } } - IceInternal::CompactIdInit::CompactIdInit(const char* typeId, int compactId) : _compactId(compactId) { diff --git a/cpp/src/Ice/IPEndpointI.cpp b/cpp/src/Ice/IPEndpointI.cpp index 476fc3b809c..26d710898f0 100644 --- a/cpp/src/Ice/IPEndpointI.cpp +++ b/cpp/src/Ice/IPEndpointI.cpp @@ -86,7 +86,6 @@ IceInternal::IPEndpointI::getInfo() const return info; } - Ice::Short IceInternal::IPEndpointI::type() const { @@ -743,7 +742,6 @@ IceInternal::EndpointHostResolver::EndpointHostResolver(const InstancePtr& insta { } - void IceInternal::EndpointHostResolver::resolve(const string& host, int port, diff --git a/cpp/src/Ice/ImplicitContextI.cpp b/cpp/src/Ice/ImplicitContextI.cpp index cc9d9c59b34..2135237dcd9 100644 --- a/cpp/src/Ice/ImplicitContextI.cpp +++ b/cpp/src/Ice/ImplicitContextI.cpp @@ -70,7 +70,6 @@ public: long owner; }; - // // Each thread maintains a SlotVector. Each PerThreadImplicitContext instance // is assigned a slot in this vector. @@ -105,8 +104,6 @@ private: extern "C" void iceImplicitContextThreadDestructor(void*); - - ImplicitContextIPtr ImplicitContextI::create(const std::string& kind) { @@ -148,7 +145,6 @@ ImplicitContextI::cleanupThread() } #endif - // // SharedImplicitContext implementation // @@ -187,7 +183,6 @@ SharedImplicitContext::get(const string& k) const return p->second; } - string SharedImplicitContext::put(const string& k, const string& v) { @@ -479,7 +474,6 @@ PerThreadImplicitContext::clearThreadContext() const } } - Context PerThreadImplicitContext::getContext() const { diff --git a/cpp/src/Ice/Incoming.cpp b/cpp/src/Ice/Incoming.cpp index 8a9416751f5..de99aebb010 100644 --- a/cpp/src/Ice/Incoming.cpp +++ b/cpp/src/Ice/Incoming.cpp @@ -558,7 +558,6 @@ IceInternal::IncomingBase::handleException(const string& msg, bool amd) _responseHandler = 0; } - IceInternal::Incoming::Incoming(Instance* instance, ResponseHandler* responseHandler, Ice::Connection* connection, const ObjectAdapterPtr& adapter, bool response, Byte compress, Int requestId) : IncomingBase(instance, responseHandler, connection, adapter, response, compress, requestId), diff --git a/cpp/src/Ice/Initialize.cpp b/cpp/src/Ice/Initialize.cpp index 65550223b42..cc1997f2c65 100644 --- a/cpp/src/Ice/Initialize.cpp +++ b/cpp/src/Ice/Initialize.cpp @@ -393,7 +393,6 @@ Ice::registerPluginFactory(const std::string& name, PluginFactory factory, bool PluginManagerI::registerPluginFactory(name, factory, loadOnInitialize); } - // // CommunicatorHolder // diff --git a/cpp/src/Ice/InputStream.cpp b/cpp/src/Ice/InputStream.cpp index 0dc57a742ac..e61350d19d7 100644 --- a/cpp/src/Ice/InputStream.cpp +++ b/cpp/src/Ice/InputStream.cpp @@ -36,7 +36,6 @@ using namespace std; using namespace Ice; using namespace IceInternal; - Ice::InputStream::InputStream() { initialize(currentEncoding); @@ -1060,7 +1059,6 @@ Ice::InputStream::read(vector<Double>& v) } } - #ifdef ICE_CPP11_MAPPING void Ice::InputStream::read(pair<const Double*, const Double*>& v) diff --git a/cpp/src/Ice/Instance.cpp b/cpp/src/Ice/Instance.cpp index da0758bb4c4..87d15201c98 100644 --- a/cpp/src/Ice/Instance.cpp +++ b/cpp/src/Ice/Instance.cpp @@ -188,7 +188,6 @@ private: const InstancePtr _instance; }; - // // Timer specialization which supports the thread observer // @@ -1103,7 +1102,6 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, const Initi } } - if(!_initData.logger) { string logfile = _initData.properties->getProperty("Ice.LogFile"); @@ -1223,7 +1221,6 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, const Initi throw InitializationException(__FILE__, __LINE__, "The value for Ice.ToStringMode must be Unicode, ASCII or Compat"); } - // // Client ACM enabled by default. Server ACM disabled by default. // @@ -1790,7 +1787,6 @@ IceInternal::Instance::updateThreadObservers() } } - BufSizeWarnInfo IceInternal::Instance::getBufSizeWarn(Short type) { diff --git a/cpp/src/Ice/InstrumentationI.cpp b/cpp/src/Ice/InstrumentationI.cpp index 27fe4c71b5f..7751721ba2b 100644 --- a/cpp/src/Ice/InstrumentationI.cpp +++ b/cpp/src/Ice/InstrumentationI.cpp @@ -468,7 +468,6 @@ public: return _proxy; } - string getIdentity() const { diff --git a/cpp/src/Ice/LocatorInfo.cpp b/cpp/src/Ice/LocatorInfo.cpp index 9c95d223bf0..95695c88e39 100644 --- a/cpp/src/Ice/LocatorInfo.cpp +++ b/cpp/src/Ice/LocatorInfo.cpp @@ -546,7 +546,6 @@ IceInternal::LocatorInfo::getLocatorRegistry() } } - void IceInternal::LocatorInfo::getEndpoints(const ReferencePtr& ref, const ReferencePtr& wellKnownRef, diff --git a/cpp/src/Ice/LoggerAdminI.cpp b/cpp/src/Ice/LoggerAdminI.cpp index 99a8bae1425..01b9994d560 100644 --- a/cpp/src/Ice/LoggerAdminI.cpp +++ b/cpp/src/Ice/LoggerAdminI.cpp @@ -124,7 +124,6 @@ private: }; ICE_DEFINE_PTR(LoggerAdminIPtr, LoggerAdminI); - class Job : public IceUtil::Shared { public: @@ -140,7 +139,6 @@ public: }; typedef IceUtil::Handle<Job> JobPtr; - class LoggerAdminLoggerI : public IceInternal::LoggerAdminLogger #ifdef ICE_CPP11_MAPPING , public std::enable_shared_from_this<LoggerAdminLoggerI> @@ -187,7 +185,6 @@ private: }; ICE_DEFINE_PTR(LoggerAdminLoggerIPtr, LoggerAdminLoggerI); - class SendLogThread : public IceUtil::Thread { public: @@ -201,7 +198,6 @@ private: LoggerAdminLoggerIPtr _logger; }; - // // Helper functions // diff --git a/cpp/src/Ice/LoggerUtil.cpp b/cpp/src/Ice/LoggerUtil.cpp index 67ff1d3239a..60dc66d4d76 100644 --- a/cpp/src/Ice/LoggerUtil.cpp +++ b/cpp/src/Ice/LoggerUtil.cpp @@ -56,7 +56,6 @@ Ice::loggerInsert(Ice::LoggerOutputBase& out, const IceUtil::Exception& ex) return out; } - Ice::Trace::Trace(const LoggerPtr& logger, const string& category) : _logger(logger), _category(category) @@ -79,7 +78,6 @@ Ice::Trace::flush() _stream().str(""); } - Ice::LoggerPlugin::LoggerPlugin(const CommunicatorPtr& communicator, const LoggerPtr& logger) { if(communicator == 0) diff --git a/cpp/src/Ice/Network.cpp b/cpp/src/Ice/Network.cpp index c761d65dfe0..a4b6cc10c28 100755 --- a/cpp/src/Ice/Network.cpp +++ b/cpp/src/Ice/Network.cpp @@ -72,7 +72,6 @@ extern "C" } #endif - using namespace std; using namespace Ice; using namespace IceInternal; @@ -2246,7 +2245,6 @@ IceInternal::setReuseAddress(SOCKET fd, bool reuse) } #endif - #ifdef ICE_OS_UWP namespace { @@ -2747,7 +2745,6 @@ repeatAccept: return ret; } - void IceInternal::createPipe(SOCKET fds[2]) { @@ -3081,7 +3078,6 @@ IceInternal::doFinishConnectAsync(SOCKET fd, AsyncInfo& info) } #endif - bool IceInternal::isIpAddress(const string& name) { diff --git a/cpp/src/Ice/Network.h b/cpp/src/Ice/Network.h index dfb66aab954..43bd4c0fcaa 100755 --- a/cpp/src/Ice/Network.h +++ b/cpp/src/Ice/Network.h @@ -193,7 +193,6 @@ public: virtual ~ReadyCallback(); - virtual void ready(SocketOperation, bool) = 0; }; typedef IceUtil::Handle<ReadyCallback> ReadyCallbackPtr; diff --git a/cpp/src/Ice/Object.cpp b/cpp/src/Ice/Object.cpp index f69ffc497a3..a0fb5b5c9da 100644 --- a/cpp/src/Ice/Object.cpp +++ b/cpp/src/Ice/Object.cpp @@ -171,7 +171,6 @@ Ice::Object::_iceD_ice_id(Incoming& inS, const Current& current) return true; } - bool #ifdef ICE_CPP11_MAPPING Ice::Object::ice_dispatch(Request& request, std::function<bool()> r, std::function<bool(std::exception_ptr)> e) diff --git a/cpp/src/Ice/ObjectAdapterI.h b/cpp/src/Ice/ObjectAdapterI.h index bad7a896c87..00e70b1ccb8 100644 --- a/cpp/src/Ice/ObjectAdapterI.h +++ b/cpp/src/Ice/ObjectAdapterI.h @@ -74,7 +74,6 @@ public: virtual ObjectPtr findByProxy(const ObjectPrxPtr&) const; virtual ObjectPtr findDefaultServant(const std::string&) const; - virtual void addServantLocator(const ServantLocatorPtr&, const std::string&); virtual ServantLocatorPtr removeServantLocator(const std::string&); virtual ServantLocatorPtr findServantLocator(const std::string&) const; diff --git a/cpp/src/Ice/OpaqueEndpointI.cpp b/cpp/src/Ice/OpaqueEndpointI.cpp index 065af32eae9..df53a9216cb 100644 --- a/cpp/src/Ice/OpaqueEndpointI.cpp +++ b/cpp/src/Ice/OpaqueEndpointI.cpp @@ -211,7 +211,6 @@ IceInternal::OpaqueEndpointI::equivalent(const EndpointIPtr&) const return false; } - Int IceInternal::OpaqueEndpointI::hash() const { diff --git a/cpp/src/Ice/OutgoingAsync.cpp b/cpp/src/Ice/OutgoingAsync.cpp index 60d4cc04983..0c312b4c6f3 100644 --- a/cpp/src/Ice/OutgoingAsync.cpp +++ b/cpp/src/Ice/OutgoingAsync.cpp @@ -1323,5 +1323,4 @@ GenericCallbackBase::~GenericCallbackBase() // Out of line to avoid weak vtable } - #endif diff --git a/cpp/src/Ice/PluginManagerI.h b/cpp/src/Ice/PluginManagerI.h index 1386f3e653a..e7da4de1513 100644 --- a/cpp/src/Ice/PluginManagerI.h +++ b/cpp/src/Ice/PluginManagerI.h @@ -63,5 +63,4 @@ typedef IceUtil::Handle<PluginManagerI> PluginManagerIPtr; } - #endif diff --git a/cpp/src/Ice/PropertiesI.cpp b/cpp/src/Ice/PropertiesI.cpp index 39445713307..12b337f0987 100644 --- a/cpp/src/Ice/PropertiesI.cpp +++ b/cpp/src/Ice/PropertiesI.cpp @@ -118,7 +118,6 @@ Ice::PropertiesI::getPropertyAsListWithDefault(const string& key, const StringSe } } - PropertyDict Ice::PropertiesI::getPropertiesForPrefix(const string& prefix) { diff --git a/cpp/src/Ice/PropertyNames.cpp b/cpp/src/Ice/PropertyNames.cpp index adfc4c3802e..910a0cc2ace 100644 --- a/cpp/src/Ice/PropertyNames.cpp +++ b/cpp/src/Ice/PropertyNames.cpp @@ -1345,7 +1345,6 @@ const IceInternal::PropertyArray IceInternal::PropertyNames::FreezeProps(FreezePropsData, sizeof(FreezePropsData)/sizeof(FreezePropsData[0])); - const IceInternal::PropertyArray IceInternal::PropertyNames::validProps[] = { IceProps, @@ -1368,7 +1367,6 @@ const IceInternal::PropertyArray IceInternal::PropertyNames::validProps[] = IceInternal::PropertyArray(0,0) }; - const char* IceInternal::PropertyNames::clPropNames[] = { "Ice", diff --git a/cpp/src/Ice/Proxy.cpp b/cpp/src/Ice/Proxy.cpp index f5d6551edf1..ea668c25017 100644 --- a/cpp/src/Ice/Proxy.cpp +++ b/cpp/src/Ice/Proxy.cpp @@ -243,7 +243,6 @@ Ice::ObjectPrx::_checkTwowayOnly(const string& name) const } } - shared_ptr<ObjectPrx> Ice::ObjectPrx::_newInstance() const { diff --git a/cpp/src/Ice/Reference.cpp b/cpp/src/Ice/Reference.cpp index f2fe254204a..baf9f9eb719 100644 --- a/cpp/src/Ice/Reference.cpp +++ b/cpp/src/Ice/Reference.cpp @@ -1635,7 +1635,6 @@ IceInternal::RoutableReference::getConnectionNoRouterInfo(const GetConnectionCal const bool _cached; }; - virtual void setEndpoints(const vector<EndpointIPtr>& endpoints, bool cached) { diff --git a/cpp/src/Ice/Reference.h b/cpp/src/Ice/Reference.h index 4ed7f13837f..3addd9a29f0 100644 --- a/cpp/src/Ice/Reference.h +++ b/cpp/src/Ice/Reference.h @@ -75,7 +75,6 @@ public: Ice::CommunicatorPtr getCommunicator() const; - virtual std::vector<EndpointIPtr> getEndpoints() const = 0; virtual std::string getAdapterId() const = 0; virtual LocatorInfoPtr getLocatorInfo() const { return 0; } diff --git a/cpp/src/Ice/RequestHandler.cpp b/cpp/src/Ice/RequestHandler.cpp index 0994a63b2e3..818c7d10ab1 100644 --- a/cpp/src/Ice/RequestHandler.cpp +++ b/cpp/src/Ice/RequestHandler.cpp @@ -18,7 +18,6 @@ IceUtil::Shared* IceInternal::upCast(RequestHandler* p) { return p; } IceUtil::Shared* IceInternal::upCast(CancellationHandler* p) { return p; } #endif - RetryException::RetryException(const Ice::LocalException& ex) { ICE_SET_EXCEPTION_FROM_CLONE(_ex, ex.ice_clone()); diff --git a/cpp/src/Ice/RequestHandler.h b/cpp/src/Ice/RequestHandler.h index 50920dcb0d0..a6eeb211352 100644 --- a/cpp/src/Ice/RequestHandler.h +++ b/cpp/src/Ice/RequestHandler.h @@ -47,7 +47,6 @@ private: IceInternal::UniquePtr<Ice::LocalException> _ex; }; - class CancellationHandler #ifndef ICE_CPP11_MAPPING : public virtual IceUtil::Shared diff --git a/cpp/src/Ice/RetryQueue.h b/cpp/src/Ice/RetryQueue.h index 21a4111b37f..f7aef04bab7 100644 --- a/cpp/src/Ice/RetryQueue.h +++ b/cpp/src/Ice/RetryQueue.h @@ -39,7 +39,6 @@ public: bool operator<(const RetryTask&) const; - private: const InstancePtr _instance; diff --git a/cpp/src/Ice/RouterInfo.cpp b/cpp/src/Ice/RouterInfo.cpp index edee8ca9026..2487b6528e0 100644 --- a/cpp/src/Ice/RouterInfo.cpp +++ b/cpp/src/Ice/RouterInfo.cpp @@ -255,7 +255,6 @@ IceInternal::RouterInfo::addProxy(const Ice::ObjectPrxPtr& proxy, const AddProxy } } - Ice::ObjectProxySeq proxies; proxies.push_back(proxy); AddProxyCookiePtr cookie = new AddProxyCookie(callback, proxy); @@ -343,7 +342,6 @@ IceInternal::RouterInfo::setClientEndpoints(const Ice::ObjectPrxPtr& proxy, bool return _clientEndpoints; } - vector<EndpointIPtr> IceInternal::RouterInfo::setServerEndpoints(const Ice::ObjectPrxPtr& /*serverProxy*/) { diff --git a/cpp/src/Ice/Selector.h b/cpp/src/Ice/Selector.h index 674151a6683..17a5986afcf 100644 --- a/cpp/src/Ice/Selector.h +++ b/cpp/src/Ice/Selector.h @@ -58,7 +58,6 @@ class SelectorTimeoutException { }; - #if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP) class Selector diff --git a/cpp/src/Ice/SlicedData.cpp b/cpp/src/Ice/SlicedData.cpp index e85c3f35492..99871f5bafa 100644 --- a/cpp/src/Ice/SlicedData.cpp +++ b/cpp/src/Ice/SlicedData.cpp @@ -30,7 +30,6 @@ Ice::SlicedData::SlicedData(const SliceInfoSeq& seq) : { } - #ifndef ICE_CPP11_MAPPING void Ice::SlicedData::_iceGcVisitMembers(IceInternal::GCVisitor& visitor) diff --git a/cpp/src/Ice/Thread.cpp b/cpp/src/Ice/Thread.cpp index 1c6cc22dd50..6f32aacfe6b 100644 --- a/cpp/src/Ice/Thread.cpp +++ b/cpp/src/Ice/Thread.cpp @@ -663,7 +663,6 @@ startHook(void* arg) } } - IceUtil::ThreadControl IceUtil::Thread::start(size_t stackSize) { diff --git a/cpp/src/Ice/ThreadPool.h b/cpp/src/Ice/ThreadPool.h index d1d6ba8e82c..93867c7c96c 100644 --- a/cpp/src/Ice/ThreadPool.h +++ b/cpp/src/Ice/ThreadPool.h @@ -391,5 +391,4 @@ private: }; - #endif diff --git a/cpp/src/Ice/UdpTransceiver.cpp b/cpp/src/Ice/UdpTransceiver.cpp index 98bd764814d..32a3f67b5b9 100755 --- a/cpp/src/Ice/UdpTransceiver.cpp +++ b/cpp/src/Ice/UdpTransceiver.cpp @@ -980,7 +980,6 @@ IceInternal::UdpTransceiver::UdpTransceiver(const ProtocolInstancePtr& instance, }); #endif - #ifdef ICE_USE_IOCP // // On Windows when using IOCP, we must make sure that the socket is connected without diff --git a/cpp/src/Ice/WSConnector.h b/cpp/src/Ice/WSConnector.h index 49552be1c34..c0fd21cad66 100644 --- a/cpp/src/Ice/WSConnector.h +++ b/cpp/src/Ice/WSConnector.h @@ -32,7 +32,6 @@ public: virtual bool operator==(const Connector&) const; virtual bool operator<(const Connector&) const; - WSConnector(const ProtocolInstancePtr&, const ConnectorPtr&, const std::string&, const std::string&); virtual ~WSConnector(); diff --git a/cpp/src/Ice/ios/Notifications.mm b/cpp/src/Ice/ios/Notifications.mm index 8fc1c0ae7f1..f536a13db6b 100644 --- a/cpp/src/Ice/ios/Notifications.mm +++ b/cpp/src/Ice/ios/Notifications.mm @@ -118,7 +118,6 @@ private: set<IncomingConnectionFactoryPtr> _factories; }; - } static Observer* observer = new Observer(); diff --git a/cpp/src/IceDB/IceDB.cpp b/cpp/src/IceDB/IceDB.cpp index 1f7373d94ea..8eccf18b41d 100644 --- a/cpp/src/IceDB/IceDB.cpp +++ b/cpp/src/IceDB/IceDB.cpp @@ -144,7 +144,6 @@ BadEnvException::ice_throw() const throw *this; } - Env::Env(const string& path, MDB_dbi maxDbs, size_t mapSize, unsigned int maxReaders) { int rc = mdb_env_create(&_menv); @@ -486,7 +485,6 @@ CursorBase::renew(const ReadOnlyTxn& txn) } } - // // On Windows, we use a default LMDB map size of 10MB, whereas on other platforms // (Linux, macOS), we use a default of 100MB. diff --git a/cpp/src/IceDB/IceDB.h b/cpp/src/IceDB/IceDB.h index dacf58b72a2..9f807a37f78 100644 --- a/cpp/src/IceDB/IceDB.h +++ b/cpp/src/IceDB/IceDB.h @@ -124,7 +124,6 @@ private: static const char* _name; }; - // // Codec reads and writes T to/from MDB_val // @@ -494,7 +493,6 @@ public: } }; - // // Partial specialization of Codec for Ice encoding // diff --git a/cpp/src/IceDiscovery/LocatorI.cpp b/cpp/src/IceDiscovery/LocatorI.cpp index 99e1cdc4fa6..1e0291d0094 100644 --- a/cpp/src/IceDiscovery/LocatorI.cpp +++ b/cpp/src/IceDiscovery/LocatorI.cpp @@ -25,7 +25,6 @@ LocatorRegistryI::LocatorRegistryI(const Ice::CommunicatorPtr& com) : { } - #ifdef ICE_CPP11_MAPPING void LocatorRegistryI::setAdapterDirectProxyAsync(string adapterId, diff --git a/cpp/src/IceGrid/Activator.cpp b/cpp/src/IceGrid/Activator.cpp index e13f3ef48c9..31cbcaf87bb 100644 --- a/cpp/src/IceGrid/Activator.cpp +++ b/cpp/src/IceGrid/Activator.cpp @@ -329,7 +329,6 @@ Activator::Activator(const TraceLevelsPtr& traceLevels) : fcntl(_fdIntrRead, F_SETFL, flags); #endif - } Activator::~Activator() @@ -685,7 +684,6 @@ Activator::activate(const string& name, throw ex; } - // // Convert to standard argc/argv. // @@ -958,7 +956,6 @@ Activator::kill(const string& name) sendSignal(name, SIGKILL); } - void Activator::sendSignal(const string& name, const string& signal) { diff --git a/cpp/src/IceGrid/AdminCallbackRouter.cpp b/cpp/src/IceGrid/AdminCallbackRouter.cpp index 21191b06954..39b697b800b 100644 --- a/cpp/src/IceGrid/AdminCallbackRouter.cpp +++ b/cpp/src/IceGrid/AdminCallbackRouter.cpp @@ -54,7 +54,6 @@ IceGrid::AdminCallbackRouter::removeMapping(const string& category) assert(one == 1); } - void IceGrid::AdminCallbackRouter::ice_invoke_async(const AMD_Object_ice_invokePtr& cb, const pair<const Byte*, const Byte*>& inParams, @@ -72,10 +71,8 @@ IceGrid::AdminCallbackRouter::ice_invoke_async(const AMD_Object_ice_invokePtr& c con = p->second; } - ObjectPrx target = con->createProxy(current.id)->ice_facet(current.facet); - // // Call with AMI // diff --git a/cpp/src/IceGrid/AdminI.cpp b/cpp/src/IceGrid/AdminI.cpp index 344fa0a1876..74ca87efb3a 100644 --- a/cpp/src/IceGrid/AdminI.cpp +++ b/cpp/src/IceGrid/AdminI.cpp @@ -23,7 +23,6 @@ #include <IceGrid/AdminSessionI.h> #include <IceGrid/NodeSessionI.h> - using namespace std; using namespace Ice; using namespace IceGrid; @@ -139,7 +138,6 @@ private: const AmdCB _cb; }; - template<typename AmdCB> PatcherFeedbackAggregatorPtr static newPatcherFeedback(const AmdCB& cb, Ice::Identity id, @@ -165,7 +163,6 @@ AdminI::~AdminI() { } - void AdminI::addApplication(const ApplicationDescriptor& descriptor, const Current&) { @@ -451,7 +448,6 @@ private: } - void AdminI::startServer_async(const AMD_Admin_startServerPtr& amdCB, const string& id, const Current&) { @@ -683,7 +679,6 @@ AdminI::updateObject(const Ice::ObjectPrx& proxy, const ::Ice::Current&) throw DeploymentException("proxy is null"); } - const Ice::Identity id = proxy->ice_getIdentity(); if(id.category == _database->getInstanceName()) { @@ -878,7 +873,6 @@ AdminI::getNodeHostname(const string& name, const Current&) const } } - StringSeq AdminI::getAllNodeNames(const Current&) const { diff --git a/cpp/src/IceGrid/AdminRouter.h b/cpp/src/IceGrid/AdminRouter.h index b6fb4ac2c35..3e8de89aeb4 100644 --- a/cpp/src/IceGrid/AdminRouter.h +++ b/cpp/src/IceGrid/AdminRouter.h @@ -25,7 +25,6 @@ protected: AdminRouter(const TraceLevelsPtr&); - void invokeOnTarget(const Ice::ObjectPrx&, const Ice::AMD_Object_ice_invokePtr&, const std::pair<const Ice::Byte*, const Ice::Byte*>&, diff --git a/cpp/src/IceGrid/AdminSessionI.cpp b/cpp/src/IceGrid/AdminSessionI.cpp index 7f598c2223e..4a7032b5011 100644 --- a/cpp/src/IceGrid/AdminSessionI.cpp +++ b/cpp/src/IceGrid/AdminSessionI.cpp @@ -22,7 +22,6 @@ using namespace IceGrid; namespace { - class SubscriberForwarderI : public Ice::BlobjectArrayAsync { class CallbackI: public IceUtil::Shared diff --git a/cpp/src/IceGrid/Database.cpp b/cpp/src/IceGrid/Database.cpp index 7d6c0da1c2f..d50d912cff1 100644 --- a/cpp/src/IceGrid/Database.cpp +++ b/cpp/src/IceGrid/Database.cpp @@ -1775,7 +1775,6 @@ Database::getObjectByTypeOnLeastLoadedNode(const string& type, LoadSample sample return min_element(objectsWithLoad.begin(), objectsWithLoad.end(), ObjectLoadCI())->first; } - Ice::ObjectProxySeq Database::getObjectsByType(const string& type, const Ice::ConnectionPtr& con, const Ice::Context& ctx) { diff --git a/cpp/src/IceGrid/Database.h b/cpp/src/IceGrid/Database.h index 18b3f55f160..aa545812d76 100644 --- a/cpp/src/IceGrid/Database.h +++ b/cpp/src/IceGrid/Database.h @@ -66,7 +66,6 @@ public: using IceUtil::Monitor<IceUtil::Mutex>::unlock; #endif - Database(const Ice::ObjectAdapterPtr&, const IceStorm::TopicManagerPrx&, const std::string&, const TraceLevelsPtr&, const RegistryInfo&, bool); diff --git a/cpp/src/IceGrid/DescriptorBuilder.cpp b/cpp/src/IceGrid/DescriptorBuilder.cpp index 62cf0eb7f8f..f7513cf49c6 100644 --- a/cpp/src/IceGrid/DescriptorBuilder.cpp +++ b/cpp/src/IceGrid/DescriptorBuilder.cpp @@ -727,7 +727,6 @@ CommunicatorDescriptorBuilder::addDbEnv(const XmlAttributesHelper& attrs) DbEnvDescriptor desc; desc.name = attrs("name"); - DbEnvDescriptorSeq::iterator p; for(p = _descriptor->dbEnvs.begin(); p != _descriptor->dbEnvs.end(); ++p) { diff --git a/cpp/src/IceGrid/DescriptorHelper.h b/cpp/src/IceGrid/DescriptorHelper.h index e39000da109..577869525e8 100644 --- a/cpp/src/IceGrid/DescriptorHelper.h +++ b/cpp/src/IceGrid/DescriptorHelper.h @@ -184,7 +184,6 @@ protected: const std::map<std::string, std::string>&) const; }; - class ServiceInstanceHelper : public InstanceHelper { public: @@ -206,7 +205,6 @@ private: mutable ServiceHelper _service; }; - class IceBoxHelper : public ServerHelper { public: diff --git a/cpp/src/IceGrid/Grammar.y b/cpp/src/IceGrid/Grammar.y index 1667432b98b..7c8aa0e033b 100644 --- a/cpp/src/IceGrid/Grammar.y +++ b/cpp/src/IceGrid/Grammar.y @@ -639,7 +639,6 @@ command } ; - // ---------------------------------------------------------------------- strings // ---------------------------------------------------------------------- diff --git a/cpp/src/IceGrid/IceGridNode.cpp b/cpp/src/IceGrid/IceGridNode.cpp index d28f0ec6e4c..129b2f3378c 100644 --- a/cpp/src/IceGrid/IceGridNode.cpp +++ b/cpp/src/IceGrid/IceGridNode.cpp @@ -55,7 +55,6 @@ private: ProcessPtr _origProcess; }; - class NodeService : public Service { public: @@ -97,7 +96,6 @@ private: ActivatorPtr _activator; }; - #ifdef _WIN32 void setNoIndexingAttribute(const string& pa) @@ -123,7 +121,6 @@ setNoIndexingAttribute(const string& pa) } - CollocatedRegistry::CollocatedRegistry(const CommunicatorPtr& com, const ActivatorPtr& activator, bool nowarn, @@ -204,7 +201,6 @@ NodeService::startImpl(int argc, char* argv[], int& status) string desc; vector<string> targets; - for(int i = 1; i < argc; ++i) { if(strcmp(argv[i], "-h") == 0 || strcmp(argv[i], "--help") == 0) diff --git a/cpp/src/IceGrid/IceGridRegistry.cpp b/cpp/src/IceGrid/IceGridRegistry.cpp index 1c1060d6563..d19bb11be6c 100644 --- a/cpp/src/IceGrid/IceGridRegistry.cpp +++ b/cpp/src/IceGrid/IceGridRegistry.cpp @@ -128,7 +128,6 @@ RegistryService::start(int argc, char* argv[], int& status) out << "you should set individual adapter thread pools instead."; } - TraceLevelsPtr traceLevels = new TraceLevels(communicator(), "IceGrid.Registry"); _registry = new RegistryI(communicator(), traceLevels, nowarn, readonly, initFromReplica, ""); @@ -167,7 +166,6 @@ RegistryService::initializeCommunicator(int& argc, char* argv[], InitializationData initData = initializationData; initData.properties = createProperties(argc, argv, initData.properties); - // If IceGrid.Registry.[Admin]PermissionsVerifier is not set and // IceGrid.Registry.[Admin]CryptPasswords is set, load the // Glacier2CryptPermissionsVerifier plug-in @@ -195,7 +193,6 @@ RegistryService::initializeCommunicator(int& argc, char* argv[], } } - // // Never create Admin object in Ice.Admin adapter // @@ -219,7 +216,6 @@ RegistryService::initializeCommunicator(int& argc, char* argv[], // initData.properties->setProperty("Ice.ACM.Close", "3"); - return Service::initializeCommunicator(argc, argv, initData, version); } diff --git a/cpp/src/IceGrid/Internal.ice b/cpp/src/IceGrid/Internal.ice index f136dd99564..81086130808 100644 --- a/cpp/src/IceGrid/Internal.ice +++ b/cpp/src/IceGrid/Internal.ice @@ -803,5 +803,4 @@ interface InternalRegistry extends FileReader ["cpp:const"] idempotent void shutdown(); } - } diff --git a/cpp/src/IceGrid/LocatorI.cpp b/cpp/src/IceGrid/LocatorI.cpp index b680eaebcd7..39f72078704 100644 --- a/cpp/src/IceGrid/LocatorI.cpp +++ b/cpp/src/IceGrid/LocatorI.cpp @@ -291,7 +291,6 @@ public: } } - for(LocatorAdapterInfoSeq::const_iterator p = adapters.begin(); p != adapters.end(); ++p) { if(_locator->getDirectProxy(*p, this)) @@ -811,7 +810,6 @@ private: }; - LocatorI::LocatorI(const Ice::CommunicatorPtr& communicator, const DatabasePtr& database, const WellKnownObjectsManagerPtr& wellKnownObjects, diff --git a/cpp/src/IceGrid/Makefile.mk b/cpp/src/IceGrid/Makefile.mk index bd7f8c02362..d40fea4d19f 100644 --- a/cpp/src/IceGrid/Makefile.mk +++ b/cpp/src/IceGrid/Makefile.mk @@ -82,5 +82,4 @@ icegridregistry_cppflags := $(if $(lmdb_includedir),-I$(lmdb_includedir)) icegridadmin_dependencies := IcePatch2 IceBox IceXML IceLocatorDiscovery icegridadmin_sources := $(addprefix $(currentdir)/,$(local_admin_srcs)) - projects += $(project) diff --git a/cpp/src/IceGrid/NodeAdminRouter.cpp b/cpp/src/IceGrid/NodeAdminRouter.cpp index 8f3e1a5ddc4..d83b22468a5 100644 --- a/cpp/src/IceGrid/NodeAdminRouter.cpp +++ b/cpp/src/IceGrid/NodeAdminRouter.cpp @@ -16,7 +16,6 @@ using namespace IceGrid; using namespace Ice; using namespace std; - IceGrid::NodeServerAdminRouter::NodeServerAdminRouter(const NodeIPtr& node) : AdminRouter(node->getTraceLevels()), _node(node) diff --git a/cpp/src/IceGrid/NodeI.cpp b/cpp/src/IceGrid/NodeI.cpp index b5e6d7ad2f5..b796dab7d78 100644 --- a/cpp/src/IceGrid/NodeI.cpp +++ b/cpp/src/IceGrid/NodeI.cpp @@ -431,7 +431,6 @@ NodeI::destroyServer_async(const AMD_Node_destroyServerPtr& amdCB, destroyServer(amdCB, serverId, uuid, revision, replicaName, false, current); } - void NodeI::destroyServerWithoutRestart_async(const AMD_Node_destroyServerWithoutRestartPtr& amdCB, const string& serverId, @@ -493,7 +492,6 @@ NodeI::patch_async(const AMD_Node_patchPtr& amdCB, _patchInProgress.insert(application); } - set<ServerIPtr> servers; bool patchApplication = !appDistrib->icepatch.empty(); if(server.empty()) @@ -1345,8 +1343,6 @@ NodeI::getApplicationServers(const string& application) const return servers; } - - string NodeI::getFilePath(const string& filename) const { diff --git a/cpp/src/IceGrid/Parser.cpp b/cpp/src/IceGrid/Parser.cpp index 2a6bac7606d..685c043d2b3 100644 --- a/cpp/src/IceGrid/Parser.cpp +++ b/cpp/src/IceGrid/Parser.cpp @@ -1441,7 +1441,6 @@ Parser::signalServer(const list<string>& args) } } - void Parser::writeMessage(const list<string>& args, int fd) { @@ -1936,7 +1935,6 @@ Parser::listServices(const list<string>& args) } } - void Parser::endpointsAdapter(const list<string>& args) { diff --git a/cpp/src/IceGrid/Parser.h b/cpp/src/IceGrid/Parser.h index 9ca105639b5..cb03f21f37e 100644 --- a/cpp/src/IceGrid/Parser.h +++ b/cpp/src/IceGrid/Parser.h @@ -160,7 +160,6 @@ private: void showFile(const std::string&, const std::string&, const std::string&, bool, bool, bool, int); void showLog(const std::string&, const std::string&, bool, bool, int); - std::string _commands; Ice::CommunicatorPtr _communicator; AdminSessionPrx _session; diff --git a/cpp/src/IceGrid/PlatformInfo.cpp b/cpp/src/IceGrid/PlatformInfo.cpp index ba303edf6de..0671f100cb7 100644 --- a/cpp/src/IceGrid/PlatformInfo.cpp +++ b/cpp/src/IceGrid/PlatformInfo.cpp @@ -268,7 +268,6 @@ PlatformInfo::PlatformInfo(const string& prefix, # pragma warning (default : 4996) # endif - DWORD major = osInfo.dwMajorVersion; DWORD minor = osInfo.dwMinorVersion; DWORD build = osInfo.dwBuildNumber; diff --git a/cpp/src/IceGrid/PlatformInfo.h b/cpp/src/IceGrid/PlatformInfo.h index c66d73157c8..649f2303a9b 100644 --- a/cpp/src/IceGrid/PlatformInfo.h +++ b/cpp/src/IceGrid/PlatformInfo.h @@ -18,8 +18,6 @@ # include <deque> #endif - - namespace IceGrid { @@ -86,7 +84,6 @@ private: }; - }; #endif diff --git a/cpp/src/IceGrid/ReapThread.h b/cpp/src/IceGrid/ReapThread.h index 2174a2dbb8b..3f3b762a010 100644 --- a/cpp/src/IceGrid/ReapThread.h +++ b/cpp/src/IceGrid/ReapThread.h @@ -115,7 +115,6 @@ public: } }; - class ReapThread : public IceUtil::Thread, public IceUtil::Monitor<IceUtil::Mutex> { public: diff --git a/cpp/src/IceGrid/RegistryAdminRouter.cpp b/cpp/src/IceGrid/RegistryAdminRouter.cpp index 294d802507e..e94f29d31d3 100644 --- a/cpp/src/IceGrid/RegistryAdminRouter.cpp +++ b/cpp/src/IceGrid/RegistryAdminRouter.cpp @@ -98,7 +98,6 @@ IceGrid::RegistryServerAdminRouter::ice_invoke_async(const AMD_Object_ice_invoke invokeOnTarget(target, cb, inParams, current); } - IceGrid::RegistryNodeAdminRouter::RegistryNodeAdminRouter(const string& collocNodeName, const DatabasePtr& database) : AdminRouter(database->getTraceLevels()), _collocNodeName(collocNodeName), @@ -148,8 +147,6 @@ IceGrid::RegistryNodeAdminRouter::ice_invoke_async(const AMD_Object_ice_invokePt invokeOnTarget(target, cb, inParams, current); } - - IceGrid::RegistryReplicaAdminRouter::RegistryReplicaAdminRouter(const string& name, const DatabasePtr& database) : AdminRouter(database->getTraceLevels()), diff --git a/cpp/src/IceGrid/RegistryAdminRouter.h b/cpp/src/IceGrid/RegistryAdminRouter.h index 7030f7c8ed2..f197861de86 100644 --- a/cpp/src/IceGrid/RegistryAdminRouter.h +++ b/cpp/src/IceGrid/RegistryAdminRouter.h @@ -31,7 +31,6 @@ private: const DatabasePtr _database; }; - class RegistryNodeAdminRouter : public AdminRouter { public: @@ -64,6 +63,5 @@ private: const DatabasePtr _database; }; - } #endif diff --git a/cpp/src/IceGrid/RegistryI.cpp b/cpp/src/IceGrid/RegistryI.cpp index 3e4405d0d03..42601b43e1f 100644 --- a/cpp/src/IceGrid/RegistryI.cpp +++ b/cpp/src/IceGrid/RegistryI.cpp @@ -1462,7 +1462,6 @@ RegistryI::registerReplicas(const InternalRegistryPrx& internalRegistry, const N out << "creating replica `" << replicaName << "' session"; } - try { replica->end_registerWithReplica(*p); diff --git a/cpp/src/IceGrid/ServerCache.cpp b/cpp/src/IceGrid/ServerCache.cpp index 7051f608430..ad4e264df12 100644 --- a/cpp/src/IceGrid/ServerCache.cpp +++ b/cpp/src/IceGrid/ServerCache.cpp @@ -73,7 +73,6 @@ namespace IceGrid const ServerEntryPtr _entry; }; - } CheckUpdateResult::CheckUpdateResult(const string& server, @@ -1138,7 +1137,6 @@ ServerEntry::allocated(const SessionIPtr& session) _load->sessionId = session->getId(); } - Glacier2::IdentitySetPrx identitySet = session->getGlacier2IdentitySet(); Glacier2::StringSetPrx adapterIdSet = session->getGlacier2AdapterIdSet(); if(identitySet && adapterIdSet) diff --git a/cpp/src/IceGrid/ServerI.cpp b/cpp/src/IceGrid/ServerI.cpp index 243a43e1519..767dce8f475 100644 --- a/cpp/src/IceGrid/ServerI.cpp +++ b/cpp/src/IceGrid/ServerI.cpp @@ -2662,7 +2662,6 @@ ServerI::checkAndUpdateUser(const InternalServerDescriptorPtr& desc, bool /*upda throw "node has insufficient privileges to load server under user account `" + user + "'"; } - if(pw->pw_uid == 0 && _node->getCommunicator()->getProperties()->getPropertyAsInt("IceGrid.Node.AllowRunningServersAsRoot") <= 0) { diff --git a/cpp/src/IceGrid/Util.h b/cpp/src/IceGrid/Util.h index 2bf1cff7f90..fdc717f73de 100644 --- a/cpp/src/IceGrid/Util.h +++ b/cpp/src/IceGrid/Util.h @@ -29,7 +29,6 @@ struct RandomNumberGenerator : public std::unary_function<ptrdiff_t, ptrdiff_t> } }; - template<typename T> std::insert_iterator<T> inline set_inserter(T& container) { diff --git a/cpp/src/IceLocatorDiscovery/PluginI.cpp b/cpp/src/IceLocatorDiscovery/PluginI.cpp index 79d8f7492e0..6cb65ce4ed6 100644 --- a/cpp/src/IceLocatorDiscovery/PluginI.cpp +++ b/cpp/src/IceLocatorDiscovery/PluginI.cpp @@ -30,7 +30,6 @@ typedef std::pair<function<void(bool, const pair<const Ice::Byte*, const Ice::By typedef Ice::AMD_Object_ice_invokePtr AMDCallback; #endif - class Request : #ifdef ICE_CPP11_MAPPING public std::enable_shared_from_this<Request> @@ -474,7 +473,6 @@ Request::invoke(const Ice::LocatorPrxPtr& l) #endif } - void Request::response(bool ok, const pair<const Ice::Byte*, const Ice::Byte*>& outParams) { diff --git a/cpp/src/IcePatch2Lib/ClientUtil.cpp b/cpp/src/IcePatch2Lib/ClientUtil.cpp index 8551234b666..9f7be8b649f 100644 --- a/cpp/src/IcePatch2Lib/ClientUtil.cpp +++ b/cpp/src/IcePatch2Lib/ClientUtil.cpp @@ -20,7 +20,6 @@ using namespace IceUtil; using namespace IcePatch2; using namespace IcePatch2Internal; - IcePatch2::Patcher::~Patcher() { // Out of line to avoid weak vtable @@ -199,7 +198,6 @@ Decompressor::run() } } - PatcherI::PatcherI(const CommunicatorPtr& communicator, const PatcherFeedbackPtr& feedback) : _feedback(feedback), _dataDir(communicator->getProperties()->getPropertyWithDefault("IcePatch2Client.Directory", ".")), diff --git a/cpp/src/IceSSL/AcceptorI.cpp b/cpp/src/IceSSL/AcceptorI.cpp index ccb8b65a143..68efd03c04f 100644 --- a/cpp/src/IceSSL/AcceptorI.cpp +++ b/cpp/src/IceSSL/AcceptorI.cpp @@ -28,7 +28,6 @@ IceSSL::AcceptorI::getNativeInfo() return _delegate->getNativeInfo(); } - #if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP) IceInternal::AsyncInfo* IceSSL::AcceptorI::getAsyncInfo(IceInternal::SocketOperation status) diff --git a/cpp/src/IceSSL/CertificateI.cpp b/cpp/src/IceSSL/CertificateI.cpp index cc37c6530e8..2946457d1bf 100644 --- a/cpp/src/IceSSL/CertificateI.cpp +++ b/cpp/src/IceSSL/CertificateI.cpp @@ -21,7 +21,6 @@ #include <Ice/StringConverter.h> #include <IceUtil/Time.h> - using namespace std; using namespace Ice; using namespace IceInternal; diff --git a/cpp/src/IceSSL/OpenSSLUtil.cpp b/cpp/src/IceSSL/OpenSSLUtil.cpp index ae8e5a550af..1d5853d7631 100644 --- a/cpp/src/IceSSL/OpenSSLUtil.cpp +++ b/cpp/src/IceSSL/OpenSSLUtil.cpp @@ -30,7 +30,6 @@ namespace // Hellman parameters. // - static DH* convertDH(const unsigned char* buf, int len) { diff --git a/cpp/src/IceSSL/SChannelEngine.cpp b/cpp/src/IceSSL/SChannelEngine.cpp index 2d378344ac2..289d04b69e0 100644 --- a/cpp/src/IceSSL/SChannelEngine.cpp +++ b/cpp/src/IceSSL/SChannelEngine.cpp @@ -31,7 +31,6 @@ const int ICESSL_CALG_ECDH_EPHEM = 0x0000AE06; - // // COMPILERFIX SCH_USE_STRONG_CRYPTO not defined with VC90 // @@ -307,7 +306,6 @@ findCertificates(const string& location, const string& name, const string& value return certs; } - #if defined(__MINGW32__) || (defined(_MSC_VER) && (_MSC_VER <= 1500)) // // CERT_CHAIN_ENGINE_CONFIG struct in mingw headers doesn't include diff --git a/cpp/src/IceSSL/SecureTransportCertificateI.cpp b/cpp/src/IceSSL/SecureTransportCertificateI.cpp index 00b60e1854b..b215d5dbf80 100644 --- a/cpp/src/IceSSL/SecureTransportCertificateI.cpp +++ b/cpp/src/IceSSL/SecureTransportCertificateI.cpp @@ -220,7 +220,6 @@ private: #endif - class SecureTransportCertificateI : public IceSSL::SecureTransport::Certificate, public IceSSL::CertificateI { diff --git a/cpp/src/IceSSL/SecureTransportEngine.cpp b/cpp/src/IceSSL/SecureTransportEngine.cpp index 4b8d65ef53b..bd03138fc59 100644 --- a/cpp/src/IceSSL/SecureTransportEngine.cpp +++ b/cpp/src/IceSSL/SecureTransportEngine.cpp @@ -1019,7 +1019,6 @@ IceSSL::SecureTransport::SSLEngine::createTransceiver(const InstancePtr& instanc return new IceSSL::SecureTransport::TransceiverI(instance, delegate, hostOrAdapterName, incoming); } - SSLContextRef IceSSL::SecureTransport::SSLEngine::newContext(bool incoming) { diff --git a/cpp/src/IceSSL/SecureTransportUtil.cpp b/cpp/src/IceSSL/SecureTransportUtil.cpp index 1ae54e0754d..a50fa3f075a 100644 --- a/cpp/src/IceSSL/SecureTransportUtil.cpp +++ b/cpp/src/IceSSL/SecureTransportUtil.cpp @@ -28,7 +28,6 @@ using namespace IceSSL; using namespace IceSSL::SecureTransport; using namespace std; - namespace { diff --git a/cpp/src/IceSSL/SecureTransportUtil.h b/cpp/src/IceSSL/SecureTransportUtil.h index e508a41776d..9ee2ce05b08 100644 --- a/cpp/src/IceSSL/SecureTransportUtil.h +++ b/cpp/src/IceSSL/SecureTransportUtil.h @@ -39,7 +39,6 @@ SecCertificateRef loadCertificate(const std::string&); CFArrayRef loadCACertificates(const std::string&); CFArrayRef findCertificateChain(const std::string&, const std::string&, const std::string&); - } // SecureTransport namespace end } // IceSSL namespace end diff --git a/cpp/src/IceStorm/Instance.h b/cpp/src/IceStorm/Instance.h index 7007998a650..dd4453af683 100644 --- a/cpp/src/IceStorm/Instance.h +++ b/cpp/src/IceStorm/Instance.h @@ -10,7 +10,6 @@ #ifndef INSTANCE_H #define INSTANCE_H - #include <Ice/CommunicatorF.h> #include <Ice/ObjectAdapterF.h> #include <Ice/PropertiesF.h> @@ -123,7 +122,6 @@ private: IceUtil::TimerPtr _timer; IceStorm::Instrumentation::TopicManagerObserverPtr _observer; - }; typedef IceUtil::Handle<Instance> InstancePtr; diff --git a/cpp/src/IceStorm/Observers.cpp b/cpp/src/IceStorm/Observers.cpp index d63f849129d..b1af1044a7f 100644 --- a/cpp/src/IceStorm/Observers.cpp +++ b/cpp/src/IceStorm/Observers.cpp @@ -155,7 +155,6 @@ Observers::destroyTopic(const LogUpdate& llu, const string& id) wait("destroyTopic"); } - void Observers::addSubscriber(const LogUpdate& llu, const string& name, const SubscriberRecord& rec) { diff --git a/cpp/src/IceStorm/Observers.h b/cpp/src/IceStorm/Observers.h index 5b98ae3fcd7..6b4d9f0cbc3 100644 --- a/cpp/src/IceStorm/Observers.h +++ b/cpp/src/IceStorm/Observers.h @@ -19,7 +19,6 @@ # pragma error_messages(off,hidef) #endif - namespace IceStorm { class Instance; diff --git a/cpp/src/IceStorm/Service.h b/cpp/src/IceStorm/Service.h index 469ec77de1e..356b7e40252 100644 --- a/cpp/src/IceStorm/Service.h +++ b/cpp/src/IceStorm/Service.h @@ -35,7 +35,6 @@ # endif #endif - // This API is internal to Ice, and should not be used by external // applications. namespace IceStormInternal diff --git a/cpp/src/IceStorm/Subscriber.cpp b/cpp/src/IceStorm/Subscriber.cpp index 6a12b8509aa..f0512d73d78 100644 --- a/cpp/src/IceStorm/Subscriber.cpp +++ b/cpp/src/IceStorm/Subscriber.cpp @@ -931,7 +931,6 @@ Subscriber::completed(const Ice::AsyncResultPtr& result) } } - void Subscriber::shutdown() { diff --git a/cpp/src/IceStorm/SubscriberRecord.ice b/cpp/src/IceStorm/SubscriberRecord.ice index a7624d9247e..15a30aea8ac 100644 --- a/cpp/src/IceStorm/SubscriberRecord.ice +++ b/cpp/src/IceStorm/SubscriberRecord.ice @@ -17,7 +17,6 @@ module IceStorm { - /** * * The key for persistent subscribers, or topics. diff --git a/cpp/src/IceStorm/TopicI.cpp b/cpp/src/IceStorm/TopicI.cpp index 55f52489158..a9549467bc0 100644 --- a/cpp/src/IceStorm/TopicI.cpp +++ b/cpp/src/IceStorm/TopicI.cpp @@ -1017,7 +1017,6 @@ TopicImpl::publish(bool forwarded, const EventDataSeq& events) generation = unlock.generation(); } - // Tell the master to reap this set of subscribers. This is an // AMI invocation so it shouldn't block the caller (in the // typical case) we do it outside of the mutex lock for @@ -1118,7 +1117,6 @@ TopicImpl::observerRemoveSubscriber(const LogUpdate& llu, const Ice::IdentitySeq IceUtil::Mutex::Lock sync(_subscribersMutex); - // First remove from the database. try { diff --git a/cpp/src/IceStorm/TopicManagerI.cpp b/cpp/src/IceStorm/TopicManagerI.cpp index 8e9cfe33de1..db815c72654 100644 --- a/cpp/src/IceStorm/TopicManagerI.cpp +++ b/cpp/src/IceStorm/TopicManagerI.cpp @@ -268,7 +268,6 @@ TopicManagerImpl::TopicManagerImpl(const PersistentInstancePtr& instance) : LogUpdate empty = {0, 0}; _instance->lluMap().put(txn, lluDbKey, empty); - // Recreate each of the topics. SubscriberRecordKey k; SubscriberRecord v; diff --git a/cpp/src/IceUtil/ConvertUTF.cpp b/cpp/src/IceUtil/ConvertUTF.cpp index f2e5d37b7e3..c8501dac76e 100644 --- a/cpp/src/IceUtil/ConvertUTF.cpp +++ b/cpp/src/IceUtil/ConvertUTF.cpp @@ -83,7 +83,6 @@ const UTF32 halfMask = 0x3FFUL; // #define false 0 // #define true 1 - /* --------------------------------------------------------------------- */ /* @@ -446,7 +445,6 @@ ConversionResult ConvertUTF8toUTF32 ( --------------------------------------------------------------------- */ - /* --------------------------------------------------------------------- */ /* diff --git a/cpp/src/IceUtil/ConvertUTF.h b/cpp/src/IceUtil/ConvertUTF.h index aa7928c7a70..ba6016861d1 100644 --- a/cpp/src/IceUtil/ConvertUTF.h +++ b/cpp/src/IceUtil/ConvertUTF.h @@ -91,7 +91,6 @@ ------------------------------------------------------------------------ */ - namespace IceUtilInternal { @@ -109,7 +108,6 @@ enum ConversionResult sourceIllegal /* source sequence is illegal/malformed */ }; - /* --------------------------------------------------------------------- The following 4 definitions are compiler-specific. The C standard does not guarantee that wchar_t has at least @@ -130,7 +128,6 @@ typedef bool Boolean; /* 0 or 1 */ #define UNI_MAX_UTF32 static_cast<UTF32>(0x7FFFFFFF) #define UNI_MAX_LEGAL_UTF32 static_cast<UTF32>(0x0010FFFF) - ConversionResult ConvertUTF8toUTF16( const UTF8** sourceStart, const UTF8* sourceEnd, UTF16** targetStart, UTF16* targetEnd, ConversionFlags flags); diff --git a/cpp/src/IceUtil/CtrlCHandler.cpp b/cpp/src/IceUtil/CtrlCHandler.cpp index a7900cfa0b9..79c52ea0a69 100644 --- a/cpp/src/IceUtil/CtrlCHandler.cpp +++ b/cpp/src/IceUtil/CtrlCHandler.cpp @@ -106,7 +106,6 @@ static BOOL WINAPI handlerRoutine(DWORD dwCtrlType) return TRUE; } - CtrlCHandler::CtrlCHandler(CtrlCHandlerCallback callback) { IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(globalMutex); diff --git a/cpp/src/IceUtil/OutputUtil.cpp b/cpp/src/IceUtil/OutputUtil.cpp index e7e0d043f4f..0af818ab534 100644 --- a/cpp/src/IceUtil/OutputUtil.cpp +++ b/cpp/src/IceUtil/OutputUtil.cpp @@ -71,7 +71,6 @@ IceUtilInternal::OutputBase::OutputBase(ostream& os) : { } - IceUtilInternal::OutputBase::OutputBase(const string& s) : _out(_fout), _pos(0), diff --git a/cpp/src/IceUtil/StringConverter.cpp b/cpp/src/IceUtil/StringConverter.cpp index 246c25b54e9..8949577b611 100644 --- a/cpp/src/IceUtil/StringConverter.cpp +++ b/cpp/src/IceUtil/StringConverter.cpp @@ -259,7 +259,6 @@ public: Init init; - const WstringConverterPtr& getUnicodeWstringConverter() { @@ -458,7 +457,6 @@ typedef char32_t Char32T; #endif - vector<unsigned short> IceUtilInternal::toUTF16(const vector<Byte>& source) { @@ -526,7 +524,6 @@ IceUtilInternal::toUTF32(const vector<Byte>& source) return result; } - vector<Byte> IceUtilInternal::fromUTF32(const vector<unsigned int>& source) { diff --git a/cpp/src/IceUtil/StringUtil.cpp b/cpp/src/IceUtil/StringUtil.cpp index a5c8f15a5d7..b69f247c0e5 100644 --- a/cpp/src/IceUtil/StringUtil.cpp +++ b/cpp/src/IceUtil/StringUtil.cpp @@ -33,7 +33,6 @@ toHexDigit(Byte b) } } - unsigned int addContinuationByte(string::iterator& p, string::iterator end, unsigned int codePoint) { diff --git a/cpp/src/IceUtil/ThreadException.cpp b/cpp/src/IceUtil/ThreadException.cpp index 769cd264d3d..8d681fe108b 100644 --- a/cpp/src/IceUtil/ThreadException.cpp +++ b/cpp/src/IceUtil/ThreadException.cpp @@ -49,7 +49,6 @@ IceUtil::ThreadLockedException::ice_clone() const } #endif - IceUtil::ThreadStartedException::ThreadStartedException(const char* file, int line) : ExceptionHelper<ThreadStartedException>(file, line) { @@ -80,7 +79,6 @@ IceUtil::ThreadNotStartedException::ice_id() const return "::IceUtil::ThreadNotStartedException"; } - #ifndef ICE_CPP11_MAPPING IceUtil::ThreadNotStartedException* IceUtil::ThreadNotStartedException::ice_clone() const @@ -89,7 +87,6 @@ IceUtil::ThreadNotStartedException::ice_clone() const } #endif - IceUtil::BadThreadControlException::BadThreadControlException(const char* file, int line) : ExceptionHelper<BadThreadControlException>(file, line) { diff --git a/cpp/src/IceUtil/Unicode.cpp b/cpp/src/IceUtil/Unicode.cpp index a82fc3b772c..4c5914a2c51 100644 --- a/cpp/src/IceUtil/Unicode.cpp +++ b/cpp/src/IceUtil/Unicode.cpp @@ -32,7 +32,6 @@ namespace // template<size_t wcharSize> struct WstringHelper; - template<> struct WstringHelper<2> { diff --git a/cpp/src/IceUtil/Unicode.h b/cpp/src/IceUtil/Unicode.h index a6d6d5d2a2b..cc963b8f4da 100644 --- a/cpp/src/IceUtil/Unicode.h +++ b/cpp/src/IceUtil/Unicode.h @@ -30,7 +30,6 @@ bool convertUTFWstringToUTF8(const wchar_t*& sourceStart, const wchar_t* sourceEnd, IceUtil::Byte*& targetStart, IceUtil::Byte* targetEnd); - void convertUTF8ToUTFWstring(const IceUtil::Byte*& sourceStart, const IceUtil::Byte* sourceEnd, std::wstring& target); diff --git a/cpp/src/IceUtil/UtilException.cpp b/cpp/src/IceUtil/UtilException.cpp index 3a51e5824d7..3c85b32ed53 100644 --- a/cpp/src/IceUtil/UtilException.cpp +++ b/cpp/src/IceUtil/UtilException.cpp @@ -297,7 +297,6 @@ handlePcInfoError(void* data, const char* msg, int errnum) frameInfo.setByErrorCb = true; } - int addFrame(void* sf, uintptr_t pc) { @@ -353,7 +352,6 @@ getStackFrames() return stackFrames; } - string getStackTrace(const vector<void*>& stackFrames) { @@ -626,7 +624,6 @@ IceUtil::NullHandleException::ice_clone() const } #endif - IceUtil::IllegalArgumentException::IllegalArgumentException(const char* file, int line) : ExceptionHelper<IllegalArgumentException>(file, line) { @@ -720,8 +717,6 @@ IceUtil::IllegalConversionException::reason() const return _reason; } - - IceUtil::SyscallException::SyscallException(const char* file, int line, int err ): ExceptionHelper<SyscallException>(file, line), _error(err) @@ -764,7 +759,6 @@ IceUtil::SyscallException::error() const return _error; } - IceUtil::FileLockException::FileLockException(const char* file, int line, int err, const string& path): ExceptionHelper<FileLockException>(file, line), _error(err), diff --git a/cpp/src/Slice/CPlusPlusUtil.cpp b/cpp/src/Slice/CPlusPlusUtil.cpp index a6e0408189f..4c0667aa6ad 100644 --- a/cpp/src/Slice/CPlusPlusUtil.cpp +++ b/cpp/src/Slice/CPlusPlusUtil.cpp @@ -67,7 +67,6 @@ toOptional(const string& s, int typeCtx) return result; } - string stringTypeToString(const TypePtr& type, const StringList& metaData, int typeCtx) { @@ -348,7 +347,6 @@ writeMarshalUnmarshalParams(Output& out, const ParamDeclList& params, const Oper } } - if(!requiredParams.empty() || (op && op->returnType() && !op->returnIsOptional())) { if(cpp11) @@ -513,7 +511,6 @@ Slice::ToIfdef::operator()(char c) } } - void Slice::printHeader(Output& out) { @@ -1781,7 +1778,6 @@ Slice::inWstringModule(const SequencePtr& seq) return false; } - string Slice::getDataMemberRef(const DataMemberPtr& p) { diff --git a/cpp/src/Slice/FileTracker.cpp b/cpp/src/Slice/FileTracker.cpp index 20dfc7ae93c..9379ed6ee01 100644 --- a/cpp/src/Slice/FileTracker.cpp +++ b/cpp/src/Slice/FileTracker.cpp @@ -7,7 +7,6 @@ // // ********************************************************************** - #include <Slice/FileTracker.h> #include <IceUtil/ConsoleUtil.h> #include <IceUtil/FileUtil.h> @@ -60,7 +59,6 @@ Slice::FileException::reason() const return _reason; } - static Slice::FileTrackerPtr Instance; Slice::FileTracker::FileTracker() : diff --git a/cpp/src/Slice/Grammar.y b/cpp/src/Slice/Grammar.y index 0c4900ec2f3..0ff80451885 100644 --- a/cpp/src/Slice/Grammar.y +++ b/cpp/src/Slice/Grammar.y @@ -108,7 +108,6 @@ slice_error(const char* s) %% - // ---------------------------------------------------------------------- start // ---------------------------------------------------------------------- diff --git a/cpp/src/Slice/JavaUtil.cpp b/cpp/src/Slice/JavaUtil.cpp index 3d0784e3e37..9b3b1b81f53 100644 --- a/cpp/src/Slice/JavaUtil.cpp +++ b/cpp/src/Slice/JavaUtil.cpp @@ -3218,7 +3218,6 @@ Slice::JavaCompatGenerator::sequenceHasHolder(const SequencePtr& p) const return true; } - JavaOutput* Slice::JavaCompatGenerator::createOutput() { diff --git a/cpp/src/Slice/JavaUtil.h b/cpp/src/Slice/JavaUtil.h index ce16795bdb2..2ae8f2ebd3d 100644 --- a/cpp/src/Slice/JavaUtil.h +++ b/cpp/src/Slice/JavaUtil.h @@ -97,7 +97,6 @@ protected: const std::string& = std::string(), const std::string& = std::string()) const; - // // Returns the package prefix for a give Slice file. // @@ -264,7 +263,6 @@ protected: const std::string& = std::string(), const std::string& = std::string()) const; - // // Returns the package prefix for a give Slice file. // diff --git a/cpp/src/Slice/MD5I.cpp b/cpp/src/Slice/MD5I.cpp index c74241e8491..79071b34452 100644 --- a/cpp/src/Slice/MD5I.cpp +++ b/cpp/src/Slice/MD5I.cpp @@ -131,7 +131,6 @@ #define T63 0x2ad7d2bb #define T64 /* 0xeb86d391 */ (T_MASK ^ 0x14792c6e) - static void md5_process(md5_state_t *pms, const md5_byte_t *data /*[64]*/) { diff --git a/cpp/src/Slice/Parser.cpp b/cpp/src/Slice/Parser.cpp index 593cf4c846e..4b701381319 100644 --- a/cpp/src/Slice/Parser.cpp +++ b/cpp/src/Slice/Parser.cpp @@ -1538,7 +1538,6 @@ Slice::Container::unit() const return SyntaxTreeBase::unit(); } - ModuleList Slice::Container::modules() const { @@ -6767,7 +6766,6 @@ Slice::cICompare(const std::string& s1, const std::string& s2) } #endif - // ---------------------------------------------------------------------- // DerivedToBaseCompare // ---------------------------------------------------------------------- diff --git a/cpp/src/Slice/Parser.h b/cpp/src/Slice/Parser.h index 3b593eaf25d..662e289d720 100644 --- a/cpp/src/Slice/Parser.h +++ b/cpp/src/Slice/Parser.h @@ -20,7 +20,6 @@ #include <set> #include <stdio.h> - namespace Slice { @@ -992,7 +991,6 @@ public: virtual std::string kindOf() const; virtual void visit(ParserVisitor*, bool); - protected: DataMember(const ContainerPtr&, const std::string&, const TypePtr&, bool, int, const SyntaxTreeBasePtr&, diff --git a/cpp/src/Slice/PythonUtil.cpp b/cpp/src/Slice/PythonUtil.cpp index 92560601189..188a5617c0c 100644 --- a/cpp/src/Slice/PythonUtil.cpp +++ b/cpp/src/Slice/PythonUtil.cpp @@ -897,7 +897,6 @@ Slice::Python::CodeVisitor::visitClassDefStart(const ClassDefPtr& p) _out << nl << "return _M_" << prxAbs << ".ice_uncheckedCast(proxy, facet)"; _out.dec(); - // // ice_staticId // @@ -1041,7 +1040,6 @@ Slice::Python::CodeVisitor::visitClassDefStart(const ClassDefPtr& p) _out << "))"; _out << nl << className << "._ice_type = _M_" << classType; - // // Define each operation. The arguments to the IcePy.Operation constructor are: // diff --git a/cpp/src/Slice/RubyUtil.cpp b/cpp/src/Slice/RubyUtil.cpp index 28ef26a0987..b66335fcc7e 100644 --- a/cpp/src/Slice/RubyUtil.cpp +++ b/cpp/src/Slice/RubyUtil.cpp @@ -19,7 +19,6 @@ using namespace Slice; using namespace IceUtil; using namespace IceUtilInternal; - namespace { @@ -238,7 +237,6 @@ Slice::Ruby::CodeVisitor::visitClassDefStart(const ClassDefPtr& p) bool isLocal = p->isLocal(); bool isAbstract = isInterface || p->allOperations().size() > 0; // Don't use isAbstract() - see bug 3739 - // // Do not generate any code for local interfaces. // @@ -466,7 +464,6 @@ Slice::Ruby::CodeVisitor::visitClassDefStart(const ClassDefPtr& p) const bool preserved = p->hasMetaData("preserve-slice") || p->inheritsMetaData("preserve-slice"); - _out << sp << nl << "T_" << name << ".defineClass(" << (isInterface ? "::Ice::Value" : name) << ", " << p->compactId() << ", " @@ -516,7 +513,6 @@ Slice::Ruby::CodeVisitor::visitClassDefStart(const ClassDefPtr& p) } _out << "])"; - // // Define each operation. The arguments to __defineOperation are: // diff --git a/cpp/src/Slice/Util.h b/cpp/src/Slice/Util.h index a3d22074911..a31536a6ed8 100644 --- a/cpp/src/Slice/Util.h +++ b/cpp/src/Slice/Util.h @@ -31,7 +31,6 @@ std::vector<std::string> argvToArgs(int argc, wchar_t* argv[]); std::vector<std::string> argvToArgs(int argc, char* argv[]); #endif - enum EscapeMode { UCN, Octal, ShortUCN, EC6UCN }; // Parameters: @@ -47,7 +46,6 @@ enum EscapeMode { UCN, Octal, ShortUCN, EC6UCN }; std::string toStringLiteral(const std::string&, const std::string&, const std::string&, EscapeMode, unsigned char); - void writeDependencies(const std::string&, const std::string&); diff --git a/cpp/src/icegriddb/IceGridDB.cpp b/cpp/src/icegriddb/IceGridDB.cpp index 6431f1667b6..a5bacbc3234 100644 --- a/cpp/src/icegriddb/IceGridDB.cpp +++ b/cpp/src/icegriddb/IceGridDB.cpp @@ -99,7 +99,6 @@ private: } - // // This custom version of the StreamReader allows us to customize the // reading of ReplicaGroupDescriptor @@ -125,7 +124,6 @@ struct StreamReader<IceGrid::ReplicaGroupDescriptor, Ice::InputStream> }; } - class Client : public Ice::Application { public: diff --git a/cpp/src/slice2confluence/ConfluenceOutput.cpp b/cpp/src/slice2confluence/ConfluenceOutput.cpp index b464f8a9fcd..e603b5ef73c 100644 --- a/cpp/src/slice2confluence/ConfluenceOutput.cpp +++ b/cpp/src/slice2confluence/ConfluenceOutput.cpp @@ -392,7 +392,6 @@ Confluence::ConfluenceOutput::convertCommentHTML(string comment) comment.replace(tagStart, tagEnd + 1 - tagStart, replacement); // Don't skip whitespace } - // Special case: terminate <p> (and any italics) on double newline or end of comment size_t dnl = comment.find("\n\n", tagStart + replacement.size()); tagStart = comment.find("<"); @@ -458,7 +457,6 @@ Confluence::ConfluenceOutput::startElement(const string& element) string::size_type tagpos = element.find_first_of(" "); const string tagname = element.substr(0, tagpos).c_str(); - if(tagname == "p") { _out << "\n"; diff --git a/cpp/src/slice2confluence/ConfluenceOutput.h b/cpp/src/slice2confluence/ConfluenceOutput.h index 10761537bf0..2848937ebbe 100644 --- a/cpp/src/slice2confluence/ConfluenceOutput.h +++ b/cpp/src/slice2confluence/ConfluenceOutput.h @@ -13,7 +13,6 @@ #include <IceUtil/OutputUtil.h> #include <list> - namespace Confluence { diff --git a/cpp/src/slice2confluence/Gen.cpp b/cpp/src/slice2confluence/Gen.cpp index 064236b0c61..ef17947e9f5 100644 --- a/cpp/src/slice2confluence/Gen.cpp +++ b/cpp/src/slice2confluence/Gen.cpp @@ -94,7 +94,6 @@ generate(const UnitPtr& unit, const string& dir, const string& header, const str } - string Slice::GeneratorBase::_dir = "."; string Slice::GeneratorBase::_header1; string Slice::GeneratorBase::_header2; @@ -200,7 +199,6 @@ Slice::GeneratorBase::setSymbols(const ContainedList& symbols) _symbols = symbols; } - void Slice::GeneratorBase::setSortOrder(const vector<string>& sortOrder) { @@ -431,7 +429,6 @@ Slice::GeneratorBase::trim(string str) return out; } - string Slice::GeneratorBase::getUpper(const std::string& str) { @@ -814,7 +811,6 @@ compareContained(const ContainedPtr& p1, const ContainedPtr& p2) //XXX --- END HACK } - if (!c1 && !c2) { // Both are top-level containers, compare cnames @@ -850,7 +846,6 @@ compareContained(const ContainedPtr& p1, const ContainedPtr& p2) if ("Instrumentation" == p1->name() || "Instrumentation" == p2->name()) { } - if (p1->name() == c2->name()) { // Module index comes before its own contents @@ -1528,7 +1523,6 @@ Slice::GeneratorBase::isTagged(const string& tag, string& comment) return false; } - string Slice::GeneratorBase::getScopedMinimized(const ContainedPtr& contained, const ContainerPtr& container, bool shortName) { @@ -1547,7 +1541,6 @@ Slice::GeneratorBase::getScopedMinimized(const ContainedPtr& contained, const Co return s.substr(2); } - // do // { // string s2 = q->scoped(); // Containing scope @@ -2074,7 +2067,6 @@ TOCGenerator::symbols() const return _symbols; } - void TOCGenerator::writeEntry(const ContainedPtr& c) { @@ -3254,7 +3246,6 @@ Slice::EnumGenerator::generate(const EnumPtr& e) _out << "\n{ztop}\n"; } - closeDoc(); start("hr"); diff --git a/cpp/src/slice2confluence/Gen.h b/cpp/src/slice2confluence/Gen.h index a33e6fe834e..10f4e0a62e3 100644 --- a/cpp/src/slice2confluence/Gen.h +++ b/cpp/src/slice2confluence/Gen.h @@ -144,8 +144,6 @@ class StartPageGenerator : private GeneratorBase { public: - - StartPageGenerator(const Files&); ~StartPageGenerator(); void generate(const ModulePtr&); @@ -155,7 +153,6 @@ private: using GeneratorBase::printHeaderFooter; void printHeaderFooter(); - typedef ::std::vector<StringPair> ModuleDescriptions; ModuleDescriptions _modules; Confluence::ConfluenceOutput _out; diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp index 6b4e25ecba6..990ddd57d47 100644 --- a/cpp/src/slice2cpp/Gen.cpp +++ b/cpp/src/slice2cpp/Gen.cpp @@ -79,7 +79,6 @@ isConstexprType(const TypePtr& type) } } - string getDeprecateSymbol(const ContainedPtr& p1, const ContainedPtr& p2) { @@ -572,7 +571,6 @@ Slice::Gen::generate(const UnitPtr& p) printHeader(C); printGeneratedHeader(C, _base + ".ice"); - string s = _base + "." + _headerExtension;; if(_include.size()) { @@ -1879,7 +1877,6 @@ Slice::Gen::ProxyVisitor::visitOperation(const OperationPtr& p) ParamDeclList inParams; ParamDeclList outParams; - vector<string> outEndArgs; for(ParamDeclList::const_iterator q = paramList.begin(); q != paramList.end(); ++q) @@ -4858,7 +4855,6 @@ Slice::Gen::MetaDataVisitor::validate(const SyntaxTreeBasePtr& cont, const Strin return newMetaData; } - void Slice::Gen::normalizeMetaData(const UnitPtr& u, bool cpp11) { @@ -4973,7 +4969,6 @@ Slice::Gen::NormalizeMetaDataVisitor::visitConst(const ConstPtr& p) p->setMetaData(normalize(p->getMetaData())); } - StringList Slice::Gen::NormalizeMetaDataVisitor::normalize(const StringList& metaData) { @@ -5521,7 +5516,6 @@ Slice::Gen::Cpp11TypesVisitor::visitExceptionStart(const ExceptionPtr& p) H << sp; H << nl << _dllMemberExport << "static const ::std::string& ice_staticId();"; - C << sp << nl << "const ::std::string&" << nl << scoped.substr(2) << "::ice_staticId()"; C << sb; // @@ -5999,7 +5993,6 @@ Slice::Gen::Cpp11ProxyVisitor::visitOperation(const OperationPtr& p) H << "context" << epar << ";"; H << eb; - // // Lambda based asynchronous operation // @@ -6677,7 +6670,6 @@ Slice::Gen::Cpp11LocalObjectVisitor::visitOperation(const OperationPtr& p) string deprecateSymbol = getDeprecateSymbol(p, cl); - if(cl->hasMetaData("async-oneway") || p->hasMetaData("async-oneway")) { vector<string> paramsDeclAMI; @@ -7681,7 +7673,6 @@ Slice::Gen::Cpp11StreamVisitor::visitEnum(const EnumPtr& p) } } - Slice::Gen::Cpp11CompatibilityVisitor::Cpp11CompatibilityVisitor(Output& h, Output&, const string& dllExport) : H(h), _dllExport(dllExport) diff --git a/cpp/src/slice2cpp/Gen.h b/cpp/src/slice2cpp/Gen.h index dd05ae03897..139f9ecd8c3 100644 --- a/cpp/src/slice2cpp/Gen.h +++ b/cpp/src/slice2cpp/Gen.h @@ -45,7 +45,6 @@ private: void writeExtraHeaders(::IceUtilInternal::Output&); - // // Returns the header extension defined in the global metadata for a given file, // or an empty string if no global metadata was found. @@ -433,7 +432,6 @@ private: std::list<int> _useWstringHist; }; - class Cpp11ObjectVisitor : public ParserVisitor { public: @@ -524,7 +522,6 @@ private: std::string _dllExport; }; - class Cpp11CompatibilityVisitor : private ::IceUtil::noncopyable, public ParserVisitor { public: diff --git a/cpp/src/slice2cs/CsUtil.cpp b/cpp/src/slice2cs/CsUtil.cpp index 87cda0a1d6c..e546f183172 100644 --- a/cpp/src/slice2cs/CsUtil.cpp +++ b/cpp/src/slice2cs/CsUtil.cpp @@ -2463,7 +2463,6 @@ Slice::CsGenerator::MetaDataVisitor::validate(const ContainedPtr& cont) s.replace(0, clrPrefix.size(), csPrefix); } - if(s.find(csPrefix) == 0) { SequencePtr seq = SequencePtr::dynamicCast(cont); diff --git a/cpp/src/slice2cs/Gen.cpp b/cpp/src/slice2cs/Gen.cpp index 627bf2cdcbe..103b12565b1 100644 --- a/cpp/src/slice2cs/Gen.cpp +++ b/cpp/src/slice2cs/Gen.cpp @@ -1424,7 +1424,6 @@ Slice::CsVisitor::splitComment(const ContainedPtr& p, StringList& summaryLines, } } - void Slice::CsVisitor::writeDocComment(const ContainedPtr& p, const string& deprecateReason, const string& extraParam) { @@ -1713,7 +1712,6 @@ Slice::CsVisitor::writeDocCommentTaskAsyncAMI(const OperationPtr& p, const strin _out << nl << "/// " << extraParam3; } - _out << nl << "/// <returns>The task object representing the asynchronous operation.</returns>"; if(!deprecateReason.empty()) diff --git a/cpp/src/slice2cs/Gen.h b/cpp/src/slice2cs/Gen.h index f8f5bb5be13..35833ae19af 100644 --- a/cpp/src/slice2cs/Gen.h +++ b/cpp/src/slice2cs/Gen.h @@ -15,7 +15,6 @@ namespace Slice { - class CsVisitor : public CsGenerator, public ParserVisitor { public: diff --git a/cpp/src/slice2html/Gen.cpp b/cpp/src/slice2html/Gen.cpp index 4ce38794401..50a6f18553b 100644 --- a/cpp/src/slice2html/Gen.cpp +++ b/cpp/src/slice2html/Gen.cpp @@ -1941,7 +1941,6 @@ TOCGenerator::symbols() const return _symbols; } - void TOCGenerator::writeEntry(const ContainedPtr& c) { diff --git a/cpp/src/slice2java/Gen.cpp b/cpp/src/slice2java/Gen.cpp index 9c01a29816d..f5c1b430e67 100644 --- a/cpp/src/slice2java/Gen.cpp +++ b/cpp/src/slice2java/Gen.cpp @@ -113,7 +113,6 @@ bool isValue(const TypePtr& type) return (b && b->usesClasses()) || cl; } - // Returns java.util.OptionalXXX.ofYYY depending on the type string ofFactory(const TypePtr& type) { @@ -4306,7 +4305,6 @@ Slice::Gen::HelperVisitor::visitSequence(const SequencePtr& p) out << nl << "return v;"; out << eb; - static const char* builtinTable[] = { "Byte", "Bool", "Short", "Int", "Long", "Float", "Double", "String" }; string optTypeS = "java.util.Optional<" + typeS + ">"; diff --git a/cpp/src/slice2java/GenCompat.cpp b/cpp/src/slice2java/GenCompat.cpp index 28d724f8646..f23183de94c 100644 --- a/cpp/src/slice2java/GenCompat.cpp +++ b/cpp/src/slice2java/GenCompat.cpp @@ -102,7 +102,6 @@ getEscapedParamName(const DataMemberList& params, const string& name) return name; } - string getDeprecateReason(const ContainedPtr& p1, const ContainedPtr& p2, const string& type) { @@ -4349,7 +4348,6 @@ Slice::GenCompat::HolderVisitor::writeHolder(const TypePtr& p) string name = contained->name(); string absolute = getAbsolute(contained, "", "", "Holder"); - string file; if(p->definitionContext()) { diff --git a/cpp/src/slice2js/Gen.cpp b/cpp/src/slice2js/Gen.cpp index 90c473f405e..b3dbc7fd13a 100644 --- a/cpp/src/slice2js/Gen.cpp +++ b/cpp/src/slice2js/Gen.cpp @@ -359,7 +359,6 @@ Slice::Gen::Gen(const string& base, const vector<string>& includePaths, const st } FileTracker::instance()->addFile(file); - printHeader(); printGeneratedHeader(_out, _fileBase + ".ice"); } @@ -696,7 +695,6 @@ Slice::Gen::RequireVisitor::writeRequires(const UnitPtr& p) seenModules.push_back("Ice"); - for(StringList::const_iterator i = includes.begin(); i != includes.end(); ++i) { set<string> modules = p->getTopLevelModules(*i); @@ -1150,7 +1148,6 @@ Slice::Gen::TypesVisitor::visitClassDefStart(const ClassDefPtr& p) _out << nl << proxyType << " = class extends " << baseProxy; _out << sb; - if(!bases.empty()) { _out << sp; diff --git a/cpp/src/slice2objc/Gen.cpp b/cpp/src/slice2objc/Gen.cpp index 5e3da9416c7..9872a07388f 100644 --- a/cpp/src/slice2objc/Gen.cpp +++ b/cpp/src/slice2objc/Gen.cpp @@ -1787,7 +1787,6 @@ Slice::Gen::TypesVisitor::writeMemberSignature(const DataMemberList& dataMembers typeString = inTypeToString(type, (*q)->optional()); } - if(q != dataMembers.begin() || ct == LocalException) { _H << " " << getParamId(*q); @@ -2621,7 +2620,6 @@ Slice::Gen::HelperVisitor::visitDictionary(const DictionaryPtr& p) _M << nl << "@end"; } - bool Slice::Gen::HelperVisitor::visitStructStart(const StructPtr& p) { diff --git a/cpp/src/slice2objc/Gen.h b/cpp/src/slice2objc/Gen.h index 0dc596c2d4d..a3bd8b6c719 100644 --- a/cpp/src/slice2objc/Gen.h +++ b/cpp/src/slice2objc/Gen.h @@ -15,7 +15,6 @@ namespace Slice { - class ObjCVisitor : public ObjCGenerator, public ParserVisitor { public: diff --git a/cpp/src/slice2objc/ObjCUtil.h b/cpp/src/slice2objc/ObjCUtil.h index b711e9a17a6..31d8027dd0f 100644 --- a/cpp/src/slice2objc/ObjCUtil.h +++ b/cpp/src/slice2objc/ObjCUtil.h @@ -112,7 +112,6 @@ private: static const std::string _msg; // "ignoring invalid metadata" }; - // // Map of module scoped name to ModulePtr. Used to verify that objc:prefix metadata directives are consistent. // diff --git a/cpp/test/Glacier2/application/Client.cpp b/cpp/test/Glacier2/application/Client.cpp index bc6fb814f5f..eb7531996bd 100644 --- a/cpp/test/Glacier2/application/Client.cpp +++ b/cpp/test/Glacier2/application/Client.cpp @@ -103,7 +103,6 @@ public: _destroyed = true; } - int _restart; bool _destroyed; CallbackReceiverIPtr _receiver; @@ -111,7 +110,6 @@ public: } // anonymous namespace end - int main(int argc, char* argv[]) { diff --git a/cpp/test/Glacier2/dynamicFiltering/SessionI.h b/cpp/test/Glacier2/dynamicFiltering/SessionI.h index a18e38bef5d..5ba0f048169 100644 --- a/cpp/test/Glacier2/dynamicFiltering/SessionI.h +++ b/cpp/test/Glacier2/dynamicFiltering/SessionI.h @@ -33,7 +33,6 @@ private: TestControllerIPtr _controller; }; - class SessionI : public Test::TestSession { public: diff --git a/cpp/test/Glacier2/dynamicFiltering/TestControllerI.cpp b/cpp/test/Glacier2/dynamicFiltering/TestControllerI.cpp index 29eecdf4d8d..6a656996038 100644 --- a/cpp/test/Glacier2/dynamicFiltering/TestControllerI.cpp +++ b/cpp/test/Glacier2/dynamicFiltering/TestControllerI.cpp @@ -73,7 +73,6 @@ TestControllerI::step(const Glacier2::SessionPrx& currentSession, const TestToke TestConfiguration& config = _configurations[currentState.config]; assert(!config.description.empty()); - bool found = false; SessionTuple session; for(vector<SessionTuple>::const_iterator i = _sessions.begin(); i != _sessions.end() && !found; ++i) diff --git a/cpp/test/Glacier2/router/Client.cpp b/cpp/test/Glacier2/router/Client.cpp index e759edf9135..5a38b1ae193 100644 --- a/cpp/test/Glacier2/router/Client.cpp +++ b/cpp/test/Glacier2/router/Client.cpp @@ -113,7 +113,6 @@ public: base = base->ice_oneway(); CallbackPrx callback = CallbackPrx::uncheckedCast(base); - // // Block the CallbackReceiver in wait() to prevent the client from // processing other incoming calls and wait to receive the callback. @@ -842,7 +841,6 @@ CallbackClient::run(int argc, char* argv[]) (*q)->getThreadControl().join(); } - cout << "ok" << endl; } diff --git a/cpp/test/Glacier2/sessionControl/SessionI.h b/cpp/test/Glacier2/sessionControl/SessionI.h index 72ac058941c..488a4b3e30f 100644 --- a/cpp/test/Glacier2/sessionControl/SessionI.h +++ b/cpp/test/Glacier2/sessionControl/SessionI.h @@ -19,7 +19,6 @@ public: virtual Glacier2::SessionPrx create(const std::string&, const Glacier2::SessionControlPrx&, const Ice::Current&); }; - class SessionI : public Test::Session { public: diff --git a/cpp/test/Glacier2/sessionHelper/Client.cpp b/cpp/test/Glacier2/sessionHelper/Client.cpp index d6001d1ebb4..a6485f282ef 100644 --- a/cpp/test/Glacier2/sessionHelper/Client.cpp +++ b/cpp/test/Glacier2/sessionHelper/Client.cpp @@ -126,7 +126,6 @@ private: return item; } - IceUtil::Monitor<IceUtil::Mutex> _monitor; #ifdef ICE_CPP11_MAPPING list<std::function<void()>> _queue; @@ -462,7 +461,6 @@ public: } cout << "ok" << endl; - cout << "uninstalling router with communicator... " << flush; communicator()->setDefaultRouter(0); cout << "ok" << endl; @@ -475,7 +473,6 @@ public: cout << "ok" << endl; } - Ice::ProcessPrxPtr process; { cout << "testing checked cast for admin object... " << flush; @@ -506,7 +503,6 @@ public: // IceUtil::ThreadControl::sleep(IceUtil::Time::milliSeconds(100)); - { IceUtil::Monitor<IceUtil::Mutex>::Lock lock(_monitor); cout << "testing SessionHelper connect after router shutdown... " << flush; @@ -569,7 +565,6 @@ private: } // Anonymous namespace end - int main(int argc, char* argv[]) { diff --git a/cpp/test/Ice/admin/AllTests.cpp b/cpp/test/Ice/admin/AllTests.cpp index 6fb11eed9a9..7c2f941207c 100644 --- a/cpp/test/Ice/admin/AllTests.cpp +++ b/cpp/test/Ice/admin/AllTests.cpp @@ -57,7 +57,6 @@ testFacets(const Ice::CommunicatorPtr& com, bool builtInFacets = true) test(facetMap.find("Facet2") != facetMap.end()); test(facetMap.find("Facet3") != facetMap.end()); - try { com->addAdminFacet(f1, "Facet1"); diff --git a/cpp/test/Ice/admin/TestI.cpp b/cpp/test/Ice/admin/TestI.cpp index 9740d4a2d91..bede35fbd14 100644 --- a/cpp/test/Ice/admin/TestI.cpp +++ b/cpp/test/Ice/admin/TestI.cpp @@ -55,8 +55,6 @@ public: } - - RemoteCommunicatorI::RemoteCommunicatorI(const Ice::CommunicatorPtr& communicator) : _communicator(communicator), #ifdef ICE_CPP11_MAPPING diff --git a/cpp/test/Ice/ami/AllTests.cpp b/cpp/test/Ice/ami/AllTests.cpp index 4d58e2e2165..035cc5249d6 100644 --- a/cpp/test/Ice/ami/AllTests.cpp +++ b/cpp/test/Ice/ami/AllTests.cpp @@ -956,7 +956,6 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) test(promise.get_future().get()); } - { p->ice_pingAsync(nullptr); } @@ -1460,7 +1459,6 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) { } - try { p->ice_oneway()->opWithResultAsync().get(); @@ -2678,7 +2676,6 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) { } - try { r = p->ice_oneway()->begin_opWithResult(); diff --git a/cpp/test/Ice/background/EndpointI.cpp b/cpp/test/Ice/background/EndpointI.cpp index 925b86c99af..a834a67df5b 100644 --- a/cpp/test/Ice/background/EndpointI.cpp +++ b/cpp/test/Ice/background/EndpointI.cpp @@ -285,7 +285,6 @@ EndpointI::operator==(const Ice::LocalObject& r) const return true; } - return *p->_endpoint == *_endpoint; } diff --git a/cpp/test/Ice/background/EndpointI.h b/cpp/test/Ice/background/EndpointI.h index 46231d7d602..551aea9be96 100644 --- a/cpp/test/Ice/background/EndpointI.h +++ b/cpp/test/Ice/background/EndpointI.h @@ -14,7 +14,6 @@ #include <Test.h> #include <Configuration.h> - class EndpointI; ICE_DEFINE_PTR(EndpointIPtr, EndpointI); diff --git a/cpp/test/Ice/background/PluginI.cpp b/cpp/test/Ice/background/PluginI.cpp index 6e41947132e..947ee566622 100644 --- a/cpp/test/Ice/background/PluginI.cpp +++ b/cpp/test/Ice/background/PluginI.cpp @@ -37,7 +37,6 @@ private: const ConfigurationPtr _configuration; }; - // // Plugin factory function. // diff --git a/cpp/test/Ice/background/Server.cpp b/cpp/test/Ice/background/Server.cpp index 1811e94a7ae..539721aebe5 100644 --- a/cpp/test/Ice/background/Server.cpp +++ b/cpp/test/Ice/background/Server.cpp @@ -124,7 +124,6 @@ private: BackgroundControllerIPtr _controller; }; - int run(int, char**, const Ice::CommunicatorPtr& communicator) { diff --git a/cpp/test/Ice/background/TestI.h b/cpp/test/Ice/background/TestI.h index ed08cbb5e80..6773c0a8ca2 100644 --- a/cpp/test/Ice/background/TestI.h +++ b/cpp/test/Ice/background/TestI.h @@ -38,7 +38,6 @@ class BackgroundControllerI : public Test::BackgroundController, IceUtil::Monito { public: - virtual void pauseCall(ICE_IN(std::string), const Ice::Current&); virtual void resumeCall(ICE_IN(std::string), const Ice::Current&); virtual void checkCallPause(const Ice::Current&); diff --git a/cpp/test/Ice/custom/AllTests.cpp b/cpp/test/Ice/custom/AllTests.cpp index 54c79bac846..3c7774a09b6 100644 --- a/cpp/test/Ice/custom/AllTests.cpp +++ b/cpp/test/Ice/custom/AllTests.cpp @@ -565,7 +565,6 @@ typedef IceUtil::Handle<Callback> CallbackPtr; #endif - Test::TestIntfPrxPtr allTests(const Ice::CommunicatorPtr& communicator) { @@ -1235,7 +1234,6 @@ allTests(const Ice::CommunicatorPtr& communicator) } cout << "ok" << endl; - cout << "testing alternate strings with AMI... " << flush; { Util::string_view in = "HELLO WORLD!"; @@ -1947,7 +1945,6 @@ allTests(const Ice::CommunicatorPtr& communicator) #endif } - { Test::ByteSeq in; in.push_back('1'); @@ -2081,7 +2078,6 @@ allTests(const Ice::CommunicatorPtr& communicator) #endif } - { Test::BoolSeq in(5); in[0] = false; @@ -2238,7 +2234,6 @@ allTests(const Ice::CommunicatorPtr& communicator) #endif } - { Test::ByteList in; in.push_back('1'); @@ -2852,7 +2847,6 @@ allTests(const Ice::CommunicatorPtr& communicator) #endif } - { deque<Test::E> in(5); in[0] = Test:: ICE_ENUM(E, E1); @@ -3102,7 +3096,6 @@ allTests(const Ice::CommunicatorPtr& communicator) #endif } - { Test::ByteSeq in; in.push_back('1'); @@ -3349,11 +3342,8 @@ allTests(const Ice::CommunicatorPtr& communicator) } cout << "ok" << endl; - - #ifndef ICE_CPP11_MAPPING - cout << "testing class mapped structs ... " << flush; Test::ClassStructPtr cs = new Test::ClassStruct(); cs->y = 10; diff --git a/cpp/test/Ice/custom/StringConverterI.cpp b/cpp/test/Ice/custom/StringConverterI.cpp index 1ae3c702114..5515e0f62a6 100644 --- a/cpp/test/Ice/custom/StringConverterI.cpp +++ b/cpp/test/Ice/custom/StringConverterI.cpp @@ -39,7 +39,6 @@ Test::StringConverterI::fromUTF8(const Byte* sourceStart, const Byte* sourceEnd, } } - Byte* Test::WstringConverterI::toUTF8(const wchar_t* sourceStart, const wchar_t* sourceEnd, UTF8Buffer& buffer) const { diff --git a/cpp/test/Ice/custom/StringView.h b/cpp/test/Ice/custom/StringView.h index b78fae1a06e..7f47aff8432 100644 --- a/cpp/test/Ice/custom/StringView.h +++ b/cpp/test/Ice/custom/StringView.h @@ -130,7 +130,6 @@ operator!=(string_view lhs, string_view rhs) } - namespace Ice { diff --git a/cpp/test/Ice/custom/Test.ice b/cpp/test/Ice/custom/Test.ice index 7a3f65bb4e0..1e4cf32fb01 100644 --- a/cpp/test/Ice/custom/Test.ice +++ b/cpp/test/Ice/custom/Test.ice @@ -162,8 +162,6 @@ interface TestIntf opVariableRangeType(["cpp:range:std::deque< ::Test::Variable>"] VariableList inSeq, out ["cpp:range:std::deque< ::Test::Variable>"] VariableList outSeq); - - ["cpp:type:std::deque<bool>"] BoolSeq opBoolSeq(["cpp:type:std::deque<bool>"] BoolSeq inSeq, out ["cpp:type:std::deque<bool>"]BoolSeq outSeq); @@ -184,12 +182,10 @@ interface TestIntf ["cpp:type:MyByteSeq"] ByteSeq opMyByteSeq(["cpp:type:MyByteSeq"] ByteSeq inSeq, out ["cpp:type:MyByteSeq"] ByteSeq outSeq); - ["cpp:view-type:Util::string_view"] string opString(["cpp:view-type:Util::string_view"] string inString, out ["cpp:view-type:Util::string_view"] string outString); - ["cpp:type:std::deque<std::string>"] StringSeq opStringSeq(["cpp:type:std::deque<std::string>"] StringSeq inSeq, out ["cpp:type:std::deque<std::string>"] StringSeq outSeq); @@ -243,13 +239,11 @@ interface TestIntf opVarDict(["cpp:type:::Test::CustomMap<std::string, ::Ice::Int>"] StringIntDict idict, out ["cpp:type:::Test::CustomMap<std::string, ::Ice::Int>"] StringIntDict odict); - ["cpp:view-type:::std::map< ::Ice::Int, ::Util::string_view>", "cpp:type:::Test::CustomMap< ::Ice::Int, std::string>"] IntStringDict opCustomIntStringDict( ["cpp:view-type:::std::map< ::Ice::Int, ::Util::string_view>", "cpp:type:::Test::CustomMap< ::Ice::Int, std::string>"] IntStringDict idict, out ["cpp:view-type:::std::map< ::Ice::Int, ::Util::string_view>", "cpp:type:::Test::CustomMap< ::Ice::Int, std::string>"] IntStringDict odict); - ShortBuffer opShortBuffer(ShortBuffer inS, out ShortBuffer outS); ["cpp:type:::Test::CustomBuffer<bool>"] BoolSeq opBoolBuffer( diff --git a/cpp/test/Ice/custom/TestAMD.ice b/cpp/test/Ice/custom/TestAMD.ice index 8c821819fa0..c649c4b7460 100644 --- a/cpp/test/Ice/custom/TestAMD.ice +++ b/cpp/test/Ice/custom/TestAMD.ice @@ -172,7 +172,6 @@ struct BufferStruct ["cpp:type:MyByteSeq"] ByteSeq opMyByteSeq(["cpp:type:MyByteSeq"] ByteSeq inSeq, out ["cpp:type:MyByteSeq"] ByteSeq outSeq); - ["cpp:view-type:Util::string_view"] string opString(["cpp:view-type:Util::string_view"] string inString, out ["cpp:view-type:Util::string_view"] string outString); @@ -235,7 +234,6 @@ struct BufferStruct ["cpp:view-type:::std::map< ::Ice::Int, ::Util::string_view>", "cpp:type:::Test::CustomMap< ::Ice::Int, std::string>"] IntStringDict idict, out ["cpp:view-type:::std::map< ::Ice::Int, ::Util::string_view>", "cpp:type:::Test::CustomMap< ::Ice::Int, std::string>"] IntStringDict odict); - ShortBuffer opShortBuffer(ShortBuffer inS, out ShortBuffer outS); ["cpp:type:::Test::CustomBuffer<bool>"] BoolSeq opBoolBuffer( diff --git a/cpp/test/Ice/custom/TestAMDI.cpp b/cpp/test/Ice/custom/TestAMDI.cpp index 3b710d9bf45..f23a343a7fd 100644 --- a/cpp/test/Ice/custom/TestAMDI.cpp +++ b/cpp/test/Ice/custom/TestAMDI.cpp @@ -77,7 +77,6 @@ TestIntfI::opVariableRangeAsync(Test::VariableList in, response(in, in); } - void TestIntfI::opByteRangeTypeAsync(Test::ByteList in, std::function<void(const Test::ByteList&, const Test::ByteList&)> response, @@ -103,7 +102,6 @@ TestIntfI::opBoolSeqAsync(std::deque<bool> in, response(in, in); } - void TestIntfI::opBoolListAsync(Test::BoolList in, std::function<void(const Test::BoolList&, const Test::BoolList&)> response, @@ -177,7 +175,6 @@ TestIntfI::opFixedListAsync(Test::FixedList in, response(in, in); } - void TestIntfI::opVariableSeqAsync(std::deque<Test::Variable> in, std::function<void(const std::deque<Test::Variable>&, @@ -327,7 +324,6 @@ TestIntfI::opShortBufferAsync(Test::ShortBuffer in, response(in, in); } - void TestIntfI::opBoolBufferAsync(Test::CustomBuffer<bool> in, std::function<void(const Test::CustomBuffer<bool>&, @@ -345,7 +341,6 @@ TestIntfI::opBufferStructAsync(Test::BufferStruct in, response(in); } - void TestIntfI::shutdownAsync(std::function<void()> response, std::function<void(std::exception_ptr)>, const Ice::Current&) @@ -629,7 +624,6 @@ TestIntfI::opClassStruct_async(const Test::AMD_TestIntf_opClassStructPtr& cb, cb->ice_response(inS, inS, inSeq); } - void TestIntfI::opOutArrayByteSeq_async(const Test::AMD_TestIntf_opOutArrayByteSeqPtr& cb, const Test::ByteSeq& inS, diff --git a/cpp/test/Ice/custom/TestAMDI.h b/cpp/test/Ice/custom/TestAMDI.h index af4d3532898..aafc85fac28 100644 --- a/cpp/test/Ice/custom/TestAMDI.h +++ b/cpp/test/Ice/custom/TestAMDI.h @@ -24,12 +24,10 @@ public: std::function<void(const ::Test::DoubleSeq&, const ::Test::DoubleSeq&)>, std::function<void(std::exception_ptr)>, const Ice::Current&) override; - void opBoolArrayAsync(std::pair<const bool*, const bool*>, std::function<void(const ::Test::BoolSeq&, const ::Test::BoolSeq&)>, std::function<void(std::exception_ptr)>, const Ice::Current&) override; - void opByteArrayAsync(std::pair<const ::Ice::Byte*, const ::Ice::Byte*>, std::function<void(const std::pair<const ::Ice::Byte*, const ::Ice::Byte*>&, const std::pair<const ::Ice::Byte*, const ::Ice::Byte*>&)>, @@ -43,7 +41,6 @@ public: std::function<void(const ::Test::BoolSeq&, const ::Test::BoolSeq&)>, std::function<void(std::exception_ptr)>, const Ice::Current&) override; - void opByteRangeAsync(Test::ByteList, std::function<void(const Test::ByteList&, const Test::ByteList&)>, std::function<void(std::exception_ptr)>, const Ice::Current&) override; @@ -52,48 +49,39 @@ public: std::function<void(const ::Test::VariableList&, const ::Test::VariableList&)>, std::function<void(std::exception_ptr)>, const Ice::Current&) override; - void opByteRangeTypeAsync(Test::ByteList, std::function<void(const ::Test::ByteList&, const ::Test::ByteList&)>, std::function<void(std::exception_ptr)>, const Ice::Current&) override; - void opVariableRangeTypeAsync(Test::VariableList, std::function<void(const ::Test::VariableList&, const ::Test::VariableList&)>, std::function<void(std::exception_ptr)>, const Ice::Current&) override; - void opBoolSeqAsync(std::deque<bool>, std::function<void(const std::deque<bool>&, const std::deque<bool>&)>, std::function<void(std::exception_ptr)>, const Ice::Current&) override; - void opBoolListAsync(::Test::BoolList, std::function<void(const ::Test::BoolList&, const ::Test::BoolList&)>, std::function<void(std::exception_ptr)>, const Ice::Current&) override; - void opByteSeqAsync(std::deque< ::Ice::Byte>, std::function<void(const std::deque< ::Ice::Byte>&, const std::deque< ::Ice::Byte>&)>, std::function<void(std::exception_ptr)>, const Ice::Current&) override; - void opByteListAsync(::Test::ByteList, std::function<void(const ::Test::ByteList&, const ::Test::ByteList&)>, std::function<void(std::exception_ptr)>, const Ice::Current&) override; - void opMyByteSeqAsync(MyByteSeq, std::function<void(const MyByteSeq&, const MyByteSeq&)>, std::function<void(std::exception_ptr)>, const Ice::Current&) override; - void opStringAsync(Util::string_view, std::function<void(const Util::string_view&, const Util::string_view&)>, std::function<void(std::exception_ptr)>, const Ice::Current&) override; - void opStringSeqAsync(std::deque<std::string>, std::function<void(const std::deque<std::string>&, const std::deque<std::string>&)>, std::function<void(std::exception_ptr)>, const Ice::Current&) override; @@ -102,18 +90,15 @@ public: std::function<void(const ::Test::StringList&, const ::Test::StringList&)>, std::function<void(std::exception_ptr)>, const Ice::Current&) override; - void opFixedSeqAsync(std::deque< ::Test::Fixed>, std::function<void(const std::deque< ::Test::Fixed>&, const std::deque< ::Test::Fixed>&)>, std::function<void(std::exception_ptr)>, const Ice::Current&) override; - void opFixedListAsync(::Test::FixedList, std::function<void(const ::Test::FixedList&, const ::Test::FixedList&)>, std::function<void(std::exception_ptr)>, const Ice::Current&) override; - void opVariableSeqAsync(std::deque< ::Test::Variable>, std::function<void(const std::deque< ::Test::Variable>&, const std::deque< ::Test::Variable>&)>, @@ -123,104 +108,85 @@ public: std::function<void(const ::Test::VariableList&, const ::Test::VariableList&)>, std::function<void(std::exception_ptr)>, const Ice::Current&) override; - void opStringStringDictSeqAsync(std::deque< ::Test::StringStringDict>, std::function<void(const std::deque< ::Test::StringStringDict>&, const std::deque< ::Test::StringStringDict>&)>, std::function<void(std::exception_ptr)>, const Ice::Current&) override; - void opStringStringDictListAsync(::Test::StringStringDictList, std::function<void(const ::Test::StringStringDictList&, const ::Test::StringStringDictList&)>, std::function<void(std::exception_ptr)>, const Ice::Current&) override; - void opESeqAsync(std::deque< ::Test::E>, std::function<void(const std::deque< ::Test::E>&, const std::deque< ::Test::E>&)>, std::function<void(std::exception_ptr)>, const Ice::Current&) override; - void opEListAsync(::Test::EList, std::function<void(const ::Test::EList&, const ::Test::EList&)>, std::function<void(std::exception_ptr)>, const Ice::Current&) override; - void opDPrxSeqAsync(std::deque<std::shared_ptr<::Test::DPrx>>, std::function<void(const std::deque<std::shared_ptr<::Test::DPrx>>&, const std::deque<std::shared_ptr<::Test::DPrx>>&)>, std::function<void(std::exception_ptr)>, const Ice::Current&) override; - void opDPrxListAsync(::Test::DPrxList, std::function<void(const ::Test::DPrxList&, const ::Test::DPrxList&)>, std::function<void(std::exception_ptr)>, const Ice::Current&) override; - void opCSeqAsync(std::deque<std::shared_ptr<Test::C>>, std::function<void(const std::deque<std::shared_ptr<Test::C>>&, const std::deque<std::shared_ptr<Test::C>>&)>, std::function<void(std::exception_ptr)>, const Ice::Current&) override; - void opCListAsync(::Test::CList, std::function<void(const ::Test::CList&, const ::Test::CList&)>, std::function<void(std::exception_ptr)>, const Ice::Current&) override; - void opClassStructAsync(::Test::ClassStruct, ::Test::ClassStructSeq, std::function<void(const ::Test::ClassStruct&, const ::Test::ClassStruct&, const ::Test::ClassStructSeq&)>, std::function<void(std::exception_ptr)>, const Ice::Current&) override; - void opOutArrayByteSeqAsync(::Test::ByteSeq, std::function<void(const std::pair<const ::Ice::Byte*, const ::Ice::Byte*>&)>, std::function<void(std::exception_ptr)>, const Ice::Current&) override; - void opOutRangeByteSeqAsync(::Test::ByteSeq, std::function<void(const Test::ByteSeq&)>, std::function<void(std::exception_ptr)>, const Ice::Current&) override; - void opIntStringDictAsync(::Test::IntStringDict, std::function<void(const ::Test::IntStringDict&, const ::Test::IntStringDict&)>, std::function<void(std::exception_ptr)>, const Ice::Current&) override; - void opVarDictAsync(::Test::CustomMap<std::string, ::Ice::Int>, std::function<void(const ::Test::CustomMap< ::Ice::Long, ::Ice::Long>&, const ::Test::CustomMap<std::string, ::Ice::Int>&)>, std::function<void(std::exception_ptr)>, const Ice::Current&) override; - void opCustomIntStringDictAsync(std::map< ::Ice::Int, ::Util::string_view>, std::function<void(const std::map< ::Ice::Int, ::Util::string_view>&, const std::map< ::Ice::Int, ::Util::string_view>&)>, std::function<void(std::exception_ptr)>, const Ice::Current&) override; - void opShortBufferAsync(::Test::ShortBuffer, std::function<void(const ::Test::ShortBuffer&, const ::Test::ShortBuffer&)>, std::function<void(std::exception_ptr)>, const Ice::Current&) override; - void opBoolBufferAsync(::Test::CustomBuffer<bool>, std::function<void(const ::Test::CustomBuffer<bool>&, const ::Test::CustomBuffer<bool>&)>, std::function<void(std::exception_ptr)>, const Ice::Current&) override; - void opBufferStructAsync(::Test::BufferStruct, std::function<void(const ::Test::BufferStruct&)>, std::function<void(std::exception_ptr)>, const Ice::Current&) override; - void shutdownAsync(std::function<void()>, std::function<void(std::exception_ptr)>, const Ice::Current&) override; - #else virtual void opDoubleArray_async(const Test::AMD_TestIntf_opDoubleArrayPtr&, const std::pair<const Ice::Double*, const Ice::Double*>&, @@ -345,12 +311,10 @@ public: const ::Test::ClassStructSeq&, const ::Ice::Current&); - virtual void opOutArrayByteSeq_async(const ::Test::AMD_TestIntf_opOutArrayByteSeqPtr&, const ::Test::ByteSeq&, const ::Ice::Current&); - virtual void opOutRangeByteSeq_async(const ::Test::AMD_TestIntf_opOutRangeByteSeqPtr&, const ::Test::ByteSeq&, const ::Ice::Current&); diff --git a/cpp/test/Ice/custom/TestI.cpp b/cpp/test/Ice/custom/TestI.cpp index 7028b6b6412..0a78bc4d2c4 100644 --- a/cpp/test/Ice/custom/TestI.cpp +++ b/cpp/test/Ice/custom/TestI.cpp @@ -74,7 +74,6 @@ TestIntfI::opVariableRange(Test::VariableList inSeq, Test::VariableList& outSeq, return outSeq; } - Test::ByteList TestIntfI::opByteRangeType(Test::ByteList inSeq, Test::ByteList& outSeq, const Ice::Current&) { @@ -119,7 +118,6 @@ TestIntfI::opVariableRange( return outSeq; } - Test::ByteList TestIntfI::opByteRangeType(const std::pair<Test::ByteList::const_iterator, Test::ByteList::const_iterator>& inSeq, Test::ByteList& outSeq, @@ -239,8 +237,6 @@ TestIntfI::opString(ICE_IN(Util::string_view) inString, return outString; } - - std::deque< ::std::string> TestIntfI::opStringSeq(ICE_IN(std::deque< ::std::string>) inSeq, std::deque< ::std::string>& outSeq, @@ -444,8 +440,6 @@ TestIntfI::opCustomIntStringDict( return copy; } - - Test::ShortBuffer TestIntfI::opShortBuffer(ICE_IN(Test::ShortBuffer) inS, Test::ShortBuffer& outS, const Ice::Current&) { diff --git a/cpp/test/Ice/custom/TestI.h b/cpp/test/Ice/custom/TestI.h index 8ae965e20a6..75ab9bd279b 100644 --- a/cpp/test/Ice/custom/TestI.h +++ b/cpp/test/Ice/custom/TestI.h @@ -42,7 +42,6 @@ public: virtual Test::VariableList opVariableRange(Test::VariableList, Test::VariableList&, const Ice::Current&); - virtual Test::ByteList opByteRangeType(Test::ByteList, Test::ByteList&, const Ice::Current&); virtual Test::VariableList @@ -62,7 +61,6 @@ public: Test::VariableList&, const Ice::Current&); - virtual Test::ByteList opByteRangeType(const std::pair<Test::ByteList::const_iterator, Test::ByteList::const_iterator>&, Test::ByteList&, const Ice::Current&); @@ -117,7 +115,6 @@ public: std::string&, const Ice::Current&); - virtual std::deque< ::std::string> opStringSeq(ICE_IN(std::deque< ::std::string>), std::deque< ::std::string>&, const Ice::Current&); @@ -188,12 +185,10 @@ public: const Ice::Current&); #endif - virtual void opOutArrayByteSeq(ICE_IN(Test::ByteSeq), Test::ByteSeq&, const Ice::Current&); virtual void opOutRangeByteSeq(ICE_IN(Test::ByteSeq), Test::ByteSeq&, const Ice::Current&); - virtual Test::IntStringDict opIntStringDict(ICE_IN(Test::IntStringDict), Test::IntStringDict&, const Ice::Current&); @@ -201,7 +196,6 @@ public: Test::CustomMap<std::string, Ice::Int>&, const Ice::Current&); - virtual Test::CustomMap<Ice::Int, std::string> opCustomIntStringDict( ICE_IN(std::map<Ice::Int, Util::string_view>), Test::CustomMap<Ice::Int, std::string>&, const Ice::Current&); diff --git a/cpp/test/Ice/custom/WstringAMDI.cpp b/cpp/test/Ice/custom/WstringAMDI.cpp index b91f709e8b1..64dc327b507 100644 --- a/cpp/test/Ice/custom/WstringAMDI.cpp +++ b/cpp/test/Ice/custom/WstringAMDI.cpp @@ -62,7 +62,6 @@ Test2::WstringClassI::throwExceptAsync(std::wstring in, error(std::make_exception_ptr(ex)); } - #else void diff --git a/cpp/test/Ice/dispatcher/Dispatcher.cpp b/cpp/test/Ice/dispatcher/Dispatcher.cpp index 37bdc2df246..0f134d1b559 100644 --- a/cpp/test/Ice/dispatcher/Dispatcher.cpp +++ b/cpp/test/Ice/dispatcher/Dispatcher.cpp @@ -88,7 +88,6 @@ Dispatcher::run() } } - if(call) { try diff --git a/cpp/test/Ice/dispatcher/Dispatcher.h b/cpp/test/Ice/dispatcher/Dispatcher.h index ab80e78fc7b..199a048a267 100644 --- a/cpp/test/Ice/dispatcher/Dispatcher.h +++ b/cpp/test/Ice/dispatcher/Dispatcher.h @@ -55,7 +55,6 @@ public: virtual void dispatch(const Ice::DispatcherCallPtr&, const Ice::ConnectionPtr&); #endif - void run(); static void terminate(); diff --git a/cpp/test/Ice/dispatcher/TestI.h b/cpp/test/Ice/dispatcher/TestI.h index 3190a5dcba5..242ec868498 100644 --- a/cpp/test/Ice/dispatcher/TestI.h +++ b/cpp/test/Ice/dispatcher/TestI.h @@ -34,7 +34,6 @@ class TestIntfControllerI : public Test::TestIntfController, IceUtil::Monitor<Ic { public: - virtual void holdAdapter(const Ice::Current&); virtual void resumeAdapter(const Ice::Current&); diff --git a/cpp/test/Ice/exceptions/AllTests.cpp b/cpp/test/Ice/exceptions/AllTests.cpp index 32302c5c6d8..25c227dc213 100644 --- a/cpp/test/Ice/exceptions/AllTests.cpp +++ b/cpp/test/Ice/exceptions/AllTests.cpp @@ -20,7 +20,6 @@ namespace const bool printException = false; } - class EmptyI : public virtual Empty { }; diff --git a/cpp/test/Ice/exceptions/TestAMD.ice b/cpp/test/Ice/exceptions/TestAMD.ice index 6cca12e0837..c9d0bdd086b 100644 --- a/cpp/test/Ice/exceptions/TestAMD.ice +++ b/cpp/test/Ice/exceptions/TestAMD.ice @@ -70,7 +70,6 @@ module Mod } } - ["amd"] interface Thrower { void shutdown(); diff --git a/cpp/test/Ice/exceptions/TestAMDI.cpp b/cpp/test/Ice/exceptions/TestAMDI.cpp index 7500ade1d6e..8d15c8d43c0 100644 --- a/cpp/test/Ice/exceptions/TestAMDI.cpp +++ b/cpp/test/Ice/exceptions/TestAMDI.cpp @@ -531,7 +531,6 @@ ThrowerI::throwModA_async(const AMD_Thrower_throwModAPtr& /*cb*/, throw ex; } - void ThrowerI::throwUndeclaredA_async(const AMD_Thrower_throwUndeclaredAPtr& cb, Ice::Int a, const Ice::Current&) @@ -591,7 +590,6 @@ ThrowerI::throwMemoryLimitException_async(const AMD_Thrower_throwMemoryLimitExce cb->ice_response(Ice::ByteSeq(1024 * 20)); // 20 KB. } - void ThrowerI::throwLocalExceptionIdempotent_async(const AMD_Thrower_throwLocalExceptionIdempotentPtr& cb, const Ice::Current&) diff --git a/cpp/test/Ice/gc/Client.cpp b/cpp/test/Ice/gc/Client.cpp index a2238ad0f28..a7b20ce2927 100644 --- a/cpp/test/Ice/gc/Client.cpp +++ b/cpp/test/Ice/gc/Client.cpp @@ -145,7 +145,6 @@ public: } }; - class MyApplication : public Ice::Application { public: diff --git a/cpp/test/Ice/gc/Test.ice b/cpp/test/Ice/gc/Test.ice index 1b645416055..7224ece230b 100644 --- a/cpp/test/Ice/gc/Test.ice +++ b/cpp/test/Ice/gc/Test.ice @@ -64,7 +64,6 @@ class Node // Sequence of structs defined above. - sequence<C2Dict> C2DictSeq; // Sequence of dictionary. sequence<CSeq> CSeqSeq; // Sequence of sequence. diff --git a/cpp/test/Ice/impl/Test.ice b/cpp/test/Ice/impl/Test.ice index 1cb1d5ca8e7..0876845b3b9 100644 --- a/cpp/test/Ice/impl/Test.ice +++ b/cpp/test/Ice/impl/Test.ice @@ -146,7 +146,6 @@ interface MyClass LongSS opShortIntLongSS(ShortSS p1, IntSS p2, LongSS p3, out ShortSS p4, out IntSS p5, out LongSS p6); - DoubleSS opFloatDoubleSS(FloatSS p1, DoubleSS p2, out FloatSS p3, out DoubleSS p4); diff --git a/cpp/test/Ice/impl/TestAMD.ice b/cpp/test/Ice/impl/TestAMD.ice index 2c469a23406..60de31074fe 100644 --- a/cpp/test/Ice/impl/TestAMD.ice +++ b/cpp/test/Ice/impl/TestAMD.ice @@ -144,7 +144,6 @@ dictionary<MyEnum, MyEnumS> MyEnumMyEnumSD; LongSS opShortIntLongSS(ShortSS p1, IntSS p2, LongSS p3, out ShortSS p4, out IntSS p5, out LongSS p6); - DoubleSS opFloatDoubleSS(FloatSS p1, DoubleSS p2, out FloatSS p3, out DoubleSS p4); @@ -276,7 +275,6 @@ class MyClass1 string myClass1; // Same name as the enclosing class } - ["amd"] interface MyDerivedClass extends MyClass { void opDerived(); @@ -284,7 +282,6 @@ class MyClass1 MyStruct1 opMyStruct1(MyStruct1 opMyStruct1); } - // // String literals // diff --git a/cpp/test/Ice/inheritance/Test.ice b/cpp/test/Ice/inheritance/Test.ice index 6245e88b13f..8c0b009de17 100644 --- a/cpp/test/Ice/inheritance/Test.ice +++ b/cpp/test/Ice/inheritance/Test.ice @@ -82,7 +82,6 @@ interface Initial MA::IC* icop(); } - module MC { diff --git a/cpp/test/Ice/interceptor/AMDInterceptorI.cpp b/cpp/test/Ice/interceptor/AMDInterceptorI.cpp index 40236a873d6..343fa2e1f1d 100644 --- a/cpp/test/Ice/interceptor/AMDInterceptorI.cpp +++ b/cpp/test/Ice/interceptor/AMDInterceptorI.cpp @@ -22,7 +22,6 @@ AMDInterceptorI::AMDInterceptorI(const Ice::ObjectPtr& servant) : { } - bool AMDInterceptorI::dispatch(Ice::Request& request) { @@ -148,7 +147,6 @@ DispatchInterceptorAsyncCallbackI::response() return true; } - bool DispatchInterceptorAsyncCallbackI::exception(const std::exception& ex) { diff --git a/cpp/test/Ice/interceptor/Client.cpp b/cpp/test/Ice/interceptor/Client.cpp index 2126b15161a..0ac42e9b69c 100644 --- a/cpp/test/Ice/interceptor/Client.cpp +++ b/cpp/test/Ice/interceptor/Client.cpp @@ -24,7 +24,6 @@ DEFINE_TEST("client") # include <signal.h> #endif - using namespace std; #if defined(__APPLE__) || defined(ICE_OS_UWP) @@ -185,7 +184,6 @@ ClientApp::run(int, char*[]) return rs; } - int ClientApp::run(const Test::MyObjectPrxPtr& prx, const InterceptorIPtr& interceptor) { diff --git a/cpp/test/Ice/interceptor/Test.ice b/cpp/test/Ice/interceptor/Test.ice index 8d221c4e4d3..bcb0dacc20c 100644 --- a/cpp/test/Ice/interceptor/Test.ice +++ b/cpp/test/Ice/interceptor/Test.ice @@ -82,5 +82,4 @@ interface MyObject } - } diff --git a/cpp/test/Ice/invoke/AllTests.cpp b/cpp/test/Ice/invoke/AllTests.cpp index 29f2eec1865..5749878d113 100644 --- a/cpp/test/Ice/invoke/AllTests.cpp +++ b/cpp/test/Ice/invoke/AllTests.cpp @@ -503,7 +503,6 @@ allTests(const Ice::CommunicatorPtr& communicator) in.endEncapsulation(); } - { promise<bool> completed; promise<void> sent; diff --git a/cpp/test/Ice/invoke/Server.cpp b/cpp/test/Ice/invoke/Server.cpp index de3904b9fa0..dd2ff498972 100644 --- a/cpp/test/Ice/invoke/Server.cpp +++ b/cpp/test/Ice/invoke/Server.cpp @@ -79,7 +79,6 @@ private: Ice::ObjectPtr _blobject; }; - int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) { diff --git a/cpp/test/Ice/location/ServerLocator.h b/cpp/test/Ice/location/ServerLocator.h index 3314f7e0d6f..e48aca19193 100644 --- a/cpp/test/Ice/location/ServerLocator.h +++ b/cpp/test/Ice/location/ServerLocator.h @@ -20,7 +20,6 @@ public: ServerLocatorRegistry(); - #ifdef ICE_CPP11_MAPPING virtual void setAdapterDirectProxyAsync(std::string, std::shared_ptr<::Ice::ObjectPrx>, std::function<void()>, diff --git a/cpp/test/Ice/location/TestI.cpp b/cpp/test/Ice/location/TestI.cpp index 5c3bff8f9a5..6d6316a1457 100644 --- a/cpp/test/Ice/location/TestI.cpp +++ b/cpp/test/Ice/location/TestI.cpp @@ -81,7 +81,6 @@ ServerManagerI::shutdown(const Ice::Current& current) current.adapter->getCommunicator()->shutdown(); } - TestI::TestI(const Ice::ObjectAdapterPtr& adapter, const Ice::ObjectAdapterPtr& adapter2, const ServerLocatorRegistryPtr& registry) : diff --git a/cpp/test/Ice/logger/Client2.cpp b/cpp/test/Ice/logger/Client2.cpp index 311df0e169b..29da134dfe4 100644 --- a/cpp/test/Ice/logger/Client2.cpp +++ b/cpp/test/Ice/logger/Client2.cpp @@ -10,7 +10,6 @@ #include <Ice/Ice.h> #include <TestCommon.h> - using namespace std; namespace diff --git a/cpp/test/Ice/metrics/InstrumentationI.h b/cpp/test/Ice/metrics/InstrumentationI.h index bd446e426ae..61279101fa3 100644 --- a/cpp/test/Ice/metrics/InstrumentationI.h +++ b/cpp/test/Ice/metrics/InstrumentationI.h @@ -280,7 +280,6 @@ public: return connectionEstablishmentObserver; } - virtual Ice::Instrumentation::ObserverPtr getEndpointLookupObserver(const Ice::EndpointPtr&) { diff --git a/cpp/test/Ice/operations/Test.ice b/cpp/test/Ice/operations/Test.ice index c54c5daf1a2..d4c6f1c088a 100644 --- a/cpp/test/Ice/operations/Test.ice +++ b/cpp/test/Ice/operations/Test.ice @@ -146,7 +146,6 @@ interface MyClass LongSS opShortIntLongSS(ShortSS p1, IntSS p2, LongSS p3, out ShortSS p4, out IntSS p5, out LongSS p6); - DoubleSS opFloatDoubleSS(FloatSS p1, DoubleSS p2, out FloatSS p3, out DoubleSS p4); diff --git a/cpp/test/Ice/operations/TestAMD.ice b/cpp/test/Ice/operations/TestAMD.ice index 2c469a23406..60de31074fe 100644 --- a/cpp/test/Ice/operations/TestAMD.ice +++ b/cpp/test/Ice/operations/TestAMD.ice @@ -144,7 +144,6 @@ dictionary<MyEnum, MyEnumS> MyEnumMyEnumSD; LongSS opShortIntLongSS(ShortSS p1, IntSS p2, LongSS p3, out ShortSS p4, out IntSS p5, out LongSS p6); - DoubleSS opFloatDoubleSS(FloatSS p1, DoubleSS p2, out FloatSS p3, out DoubleSS p4); @@ -276,7 +275,6 @@ class MyClass1 string myClass1; // Same name as the enclosing class } - ["amd"] interface MyDerivedClass extends MyClass { void opDerived(); @@ -284,7 +282,6 @@ class MyClass1 MyStruct1 opMyStruct1(MyStruct1 opMyStruct1); } - // // String literals // diff --git a/cpp/test/Ice/operations/TestAMDI.cpp b/cpp/test/Ice/operations/TestAMDI.cpp index 21b49be2600..c0ecb21857b 100644 --- a/cpp/test/Ice/operations/TestAMDI.cpp +++ b/cpp/test/Ice/operations/TestAMDI.cpp @@ -136,7 +136,6 @@ MyDerivedClassI::opBoolAsync(bool p1, response(p2, p1); } - void MyDerivedClassI::opShortIntLongAsync(short p1, int p2, @@ -148,7 +147,6 @@ MyDerivedClassI::opShortIntLongAsync(short p1, response(p3, p1, p2, p3); } - void MyDerivedClassI::opFloatDoubleAsync(float p1, double p2, @@ -169,7 +167,6 @@ MyDerivedClassI::opStringAsync(string p1, response(p1 + " " + p2, p2 + " " + p1); } - void MyDerivedClassI::opMyEnumAsync(Test::MyEnum p1, function<void(Test::MyEnum, Test::MyEnum)> response, diff --git a/cpp/test/Ice/operations/TestI.cpp b/cpp/test/Ice/operations/TestI.cpp index a5a67fceb83..1d2de97466b 100644 --- a/cpp/test/Ice/operations/TestI.cpp +++ b/cpp/test/Ice/operations/TestI.cpp @@ -14,7 +14,6 @@ #include <functional> #include <iterator> - using namespace Ice; using namespace Test; using namespace std; @@ -840,7 +839,6 @@ MyDerivedClassI::opMStruct1(const Ice::Current& current) return OpMStruct1MarshaledResult(s, current); } - MyDerivedClassI::OpMStruct2MarshaledResult MyDerivedClassI::opMStruct2(ICE_IN(Test::Structure) p1, const Ice::Current& current) { diff --git a/cpp/test/Ice/operations/Twoways.cpp b/cpp/test/Ice/operations/Twoways.cpp index 00ed62e9c58..00abaf9960e 100644 --- a/cpp/test/Ice/operations/Twoways.cpp +++ b/cpp/test/Ice/operations/Twoways.cpp @@ -371,7 +371,6 @@ twoways(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& p) r->opVoid(); } - { Test::Structure si1; si1.p = p; diff --git a/cpp/test/Ice/operations/TwowaysAMI.cpp b/cpp/test/Ice/operations/TwowaysAMI.cpp index 88b53469094..5f0c053db78 100644 --- a/cpp/test/Ice/operations/TwowaysAMI.cpp +++ b/cpp/test/Ice/operations/TwowaysAMI.cpp @@ -18,7 +18,6 @@ # pragma GCC diagnostic ignored "-Wstrict-aliasing" #endif - // // Disable VC++ warning // 4503: decorated name length exceeded, name was truncated diff --git a/cpp/test/Ice/optional/AllTests.cpp b/cpp/test/Ice/optional/AllTests.cpp index c09083da4b8..ba90f0a95a4 100644 --- a/cpp/test/Ice/optional/AllTests.cpp +++ b/cpp/test/Ice/optional/AllTests.cpp @@ -307,7 +307,6 @@ private: FPtr _f; }; - class FactoryI #ifndef ICE_CPP11_MAPPING : public Ice::ValueFactory @@ -541,7 +540,6 @@ allTests(const Ice::CommunicatorPtr& communicator, bool) cout << "ok" << endl; - cout << "testing marshalling... " << flush; OneOptionalPtr oo4 = ICE_DYNAMIC_CAST(OneOptional, initial->pingPong(ICE_MAKE_SHARED(OneOptional))); test(!oo4->a); diff --git a/cpp/test/Ice/optional/StringView.h b/cpp/test/Ice/optional/StringView.h index b78fae1a06e..7f47aff8432 100644 --- a/cpp/test/Ice/optional/StringView.h +++ b/cpp/test/Ice/optional/StringView.h @@ -130,7 +130,6 @@ operator!=(string_view lhs, string_view rhs) } - namespace Ice { diff --git a/cpp/test/Ice/optional/TestAMDI.cpp b/cpp/test/Ice/optional/TestAMDI.cpp index 84f7fa16a6f..5d90f096a45 100644 --- a/cpp/test/Ice/optional/TestAMDI.cpp +++ b/cpp/test/Ice/optional/TestAMDI.cpp @@ -58,7 +58,6 @@ InitialI::opDerivedExceptionAsync(Ice::optional<int> a, Ice::optional<::std::str ex(make_exception_ptr(DerivedException(false, a, b, o, b, o))); } - void InitialI::opRequiredExceptionAsync(Ice::optional<int> a, Ice::optional<::std::string> b, Ice::optional<::std::shared_ptr<::Test::OneOptional>> o, ::std::function<void()>, @@ -320,7 +319,6 @@ InitialI::opIntIntDictAsync(Ice::optional<::Test::IntIntDict> p1, response(p1, p1); } - void InitialI::opStringIntDictAsync(Ice::optional<::Test::StringIntDict> p1, ::std::function<void(const Ice::optional<::Test::StringIntDict>&, const Ice::optional<::Test::StringIntDict>&)> response, @@ -557,7 +555,6 @@ InitialI::supportsNullOptionalAsync(::std::function<void(bool)> response, response(true); } - #else // C++98 mapping void @@ -636,7 +633,6 @@ InitialI::opByte_async(const ::Test::AMD_Initial_opBytePtr& cb, cb->ice_response(p1, p1); } - void InitialI::opBool_async(const ::Test::AMD_Initial_opBoolPtr& cb, const IceUtil::Optional<bool>& p1, diff --git a/cpp/test/Ice/optional/TestAMDI.h b/cpp/test/Ice/optional/TestAMDI.h index 941b4075996..e851ebf1696 100644 --- a/cpp/test/Ice/optional/TestAMDI.h +++ b/cpp/test/Ice/optional/TestAMDI.h @@ -12,7 +12,6 @@ #include <TestAMD.h> - class InitialI : public Test::Initial { public: @@ -36,7 +35,6 @@ public: ::std::function<void()>, ::std::function<void(::std::exception_ptr)>, const Ice::Current&) override; - virtual void opRequiredExceptionAsync(Ice::optional<int>, Ice::optional<::std::string>, Ice::optional<::std::shared_ptr<::Test::OneOptional>>, ::std::function<void()>, ::std::function<void(::std::exception_ptr)>, const Ice::Current&) override; @@ -45,17 +43,14 @@ public: ::std::function<void(const Ice::optional<::Ice::Byte>&, const Ice::optional<::Ice::Byte>&)>, ::std::function<void(::std::exception_ptr)>, const Ice::Current&) override; - virtual void opBoolAsync(Ice::optional<bool>, ::std::function<void(const Ice::optional<bool>&, const Ice::optional<bool>&)>, ::std::function<void(::std::exception_ptr)>, const Ice::Current&) override; - virtual void opShortAsync(Ice::optional<short>, ::std::function<void(const Ice::optional<short>&, const Ice::optional<short>&)>, ::std::function<void(::std::exception_ptr)>, const Ice::Current&) override; - virtual void opIntAsync(Ice::optional<int>, ::std::function<void(const Ice::optional<int>&, const Ice::optional<int>&)>, ::std::function<void(::std::exception_ptr)>, const Ice::Current&) override; @@ -148,7 +143,6 @@ public: ::std::function<void(const Ice::optional<::std::pair<const ::Test::FixedStruct*, const ::Test::FixedStruct*>>&, const Ice::optional<::std::pair<const ::Test::FixedStruct*, const ::Test::FixedStruct*>>&)>, ::std::function<void(::std::exception_ptr)>, const Ice::Current&) override; - virtual void opFixedStructListAsync(Ice::optional<::std::pair<const ::Test::FixedStruct*, const ::Test::FixedStruct*>>, ::std::function<void(const Ice::optional<::std::pair<const ::Test::FixedStruct*, const ::Test::FixedStruct*>>&, const Ice::optional<::std::pair<const ::Test::FixedStruct*, const ::Test::FixedStruct*>>&)>, ::std::function<void(::std::exception_ptr)>, const Ice::Current&) override; @@ -165,7 +159,6 @@ public: ::std::function<void(const Ice::optional<::Test::IntIntDict>&, const Ice::optional<::Test::IntIntDict>&)>, ::std::function<void(::std::exception_ptr)>, const Ice::Current&) override; - virtual void opStringIntDictAsync(Ice::optional<::Test::StringIntDict>, ::std::function<void(const Ice::optional<::Test::StringIntDict>&, const Ice::optional<::Test::StringIntDict>&)>, ::std::function<void(::std::exception_ptr)>, const Ice::Current&) override; @@ -290,7 +283,6 @@ public: virtual void supportsNullOptionalAsync(::std::function<void(bool)>, ::std::function<void(::std::exception_ptr)>, const Ice::Current&) override; - #else // C++98 mapping virtual void shutdown_async(const ::Test::AMD_Initial_shutdownPtr&, diff --git a/cpp/test/Ice/optional/TestI.cpp b/cpp/test/Ice/optional/TestI.cpp index 9a736a1c89d..9a583e28174 100644 --- a/cpp/test/Ice/optional/TestI.cpp +++ b/cpp/test/Ice/optional/TestI.cpp @@ -160,7 +160,6 @@ InitialI::opCustomString(ICE_IN(Optional<Util::string_view>) p1, Optional<string return p3; } - Optional<MyEnum> InitialI::opMyEnum(ICE_IN(Optional<MyEnum>) p1, Optional<MyEnum>& p3, const Current&) { @@ -413,7 +412,6 @@ InitialI::opCustomIntStringDict(ICE_IN(Optional<std::map<int, Util::string_view> return p3; } - void InitialI::opClassAndUnknownOptional(ICE_IN(APtr), const Ice::Current&) { diff --git a/cpp/test/Ice/optional/TestI.h b/cpp/test/Ice/optional/TestI.h index d1c2bb51fd8..d7a3c7a2e35 100644 --- a/cpp/test/Ice/optional/TestI.h +++ b/cpp/test/Ice/optional/TestI.h @@ -19,7 +19,6 @@ using OneOptionalPrxPtr = std::shared_ptr<Ice::ObjectPrx>; } #endif - class InitialI : public Test::Initial { public: diff --git a/cpp/test/Ice/plugin/Plugin.cpp b/cpp/test/Ice/plugin/Plugin.cpp index 35848649b71..7ac76a477ed 100644 --- a/cpp/test/Ice/plugin/Plugin.cpp +++ b/cpp/test/Ice/plugin/Plugin.cpp @@ -127,7 +127,6 @@ protected: BasePluginPtr _other; }; - class PluginOne : public BasePlugin { @@ -246,7 +245,6 @@ protected: BasePluginFailPtr _three; }; - class PluginOneFail : public BasePluginFail { diff --git a/cpp/test/Ice/properties/config/escapes.cfg b/cpp/test/Ice/properties/config/escapes.cfg index bd7c16643d9..a9d91a0a19f 100755 --- a/cpp/test/Ice/properties/config/escapes.cfg +++ b/cpp/test/Ice/properties/config/escapes.cfg @@ -22,7 +22,6 @@ foo\=bar=1 # Name is "foo=bar", value is "1" foo\#bar = 2 # Name is "foo#bar", value is "2" foo bar =3 # Name is "foo bar", value is "3" - A=1 # Name is "A", value is "1" B= 2 3 4 # Name is "B", value is "2 3 4" C=5=\#6 # 7 # Name is "C", value is "5=#6" diff --git a/cpp/test/Ice/slicing/objects/AllTests.cpp b/cpp/test/Ice/slicing/objects/AllTests.cpp index e35337d2de2..ee1600970fa 100644 --- a/cpp/test/Ice/slicing/objects/AllTests.cpp +++ b/cpp/test/Ice/slicing/objects/AllTests.cpp @@ -364,7 +364,6 @@ public: called(); } - void exception_throwUnknownDerivedAsBase(const ::Ice::Exception& ex) { diff --git a/cpp/test/Ice/slicing/objects/TestAMDI.cpp b/cpp/test/Ice/slicing/objects/TestAMDI.cpp index 46e8fa39ddc..a840e3af0cf 100644 --- a/cpp/test/Ice/slicing/objects/TestAMDI.cpp +++ b/cpp/test/Ice/slicing/objects/TestAMDI.cpp @@ -62,7 +62,6 @@ TestI::SBSKnownDerivedAsSBSKnownDerivedAsync(function<void(const shared_ptr<Test response(sbskd); } - void TestI::SBSUnknownDerivedAsSBaseAsync(function<void(const shared_ptr<Test::SBase>&)> response, function<void(exception_ptr)>, @@ -85,7 +84,6 @@ TestI::SBSUnknownDerivedAsSBaseCompactAsync(function<void(const shared_ptr<Test: response(sbsud); } - void TestI::SUnknownAsObjectAsync(function<void(const shared_ptr<Ice::Value>&)> response, function<void(exception_ptr)>, @@ -115,7 +113,6 @@ TestI::checkSUnknownAsync(Ice::ValuePtr obj, response(); } - void TestI::oneElementCycleAsync(function<void(const shared_ptr<Test::B>&)> response, function<void(exception_ptr)>, @@ -159,7 +156,6 @@ TestI::D1AsBAsync(function<void(const shared_ptr<Test::B>&)> response, response(d1); } - void TestI::D1AsD1Async(function<void(const shared_ptr<Test::D1>&)> response, function<void(exception_ptr)>, @@ -303,7 +299,6 @@ TestI::returnTest1Async(function<void(const shared_ptr<Test::B>&, response(d2, d2, d1); } - void TestI::returnTest2Async(function<void(const shared_ptr<Test::B>&, const shared_ptr<Test::B>&, @@ -334,7 +329,6 @@ TestI::returnTest3Async(shared_ptr<::Test::B> p1, response(p1); } - void TestI::sequenceTestAsync(shared_ptr<::Test::SS1> p1, shared_ptr<::Test::SS2> p2, @@ -348,7 +342,6 @@ TestI::sequenceTestAsync(shared_ptr<::Test::SS1> p1, response(ss); } - void TestI::dictionaryTestAsync(Test::BDict bin, function<void(const ::Test::BDict&, const ::Test::BDict&)> response, @@ -391,7 +384,6 @@ TestI::exchangePBaseAsync(shared_ptr<::Test::PBase> pb, response(pb); } - void TestI::PBSUnknownAsPreservedAsync(function<void(const shared_ptr<::Test::Preserved>&)> response, function<void(exception_ptr)>, @@ -455,7 +447,6 @@ TestI::PBSUnknownAsPreservedWithGraphAsync(function<void(const shared_ptr<::Test r->graph->next->next->next = nullptr; // Break the cycle. } - void TestI::checkPBSUnknownWithGraphAsync(shared_ptr<::Test::Preserved> p, function<void()> response, diff --git a/cpp/test/Ice/timeout/Server.cpp b/cpp/test/Ice/timeout/Server.cpp index f870738ad6e..ff4bb0b1329 100644 --- a/cpp/test/Ice/timeout/Server.cpp +++ b/cpp/test/Ice/timeout/Server.cpp @@ -28,7 +28,6 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) return EXIT_SUCCESS; } - int main(int argc, char* argv[]) { diff --git a/cpp/test/IceBox/configuration/config.service1-2 b/cpp/test/IceBox/configuration/config.service1-2 index 835acbadfc9..e7f07a370f2 100644 --- a/cpp/test/IceBox/configuration/config.service1-2 +++ b/cpp/test/IceBox/configuration/config.service1-2 @@ -7,5 +7,4 @@ Service1.ArgProp=1 OverrideMe=2 UnsetMe= - Ice.PrintAdapterReady=0 diff --git a/cpp/test/IceDiscovery/simple/Test.ice b/cpp/test/IceDiscovery/simple/Test.ice index 9375593e475..007fc57f2ac 100644 --- a/cpp/test/IceDiscovery/simple/Test.ice +++ b/cpp/test/IceDiscovery/simple/Test.ice @@ -9,7 +9,6 @@ #pragma once - module Test { diff --git a/cpp/test/IceGrid/activation/AllTests.cpp b/cpp/test/IceGrid/activation/AllTests.cpp index 4ddb3d64360..ec5add2a2db 100644 --- a/cpp/test/IceGrid/activation/AllTests.cpp +++ b/cpp/test/IceGrid/activation/AllTests.cpp @@ -85,7 +85,6 @@ private: }; typedef IceUtil::Handle<PingThread> PingThreadPtr; - void allTests(const Ice::CommunicatorPtr& communicator) { @@ -375,7 +374,6 @@ allTests(const Ice::CommunicatorPtr& communicator) } cout << "ok" << endl; - cout << "testing server enable... " << flush; try { @@ -483,7 +481,6 @@ allTests(const Ice::CommunicatorPtr& communicator) } threads.resize(0); - try { admin->startServer("invalid-pwd-no-oa"); @@ -602,7 +599,6 @@ allTests(const Ice::CommunicatorPtr& communicator) } cout << "ok" << endl; - cout << "testing temporary disable on failure... " << flush; try { diff --git a/cpp/test/IceGrid/allocation/AllTests.cpp b/cpp/test/IceGrid/allocation/AllTests.cpp index ed50d2236d9..a5ec6e3b097 100644 --- a/cpp/test/IceGrid/allocation/AllTests.cpp +++ b/cpp/test/IceGrid/allocation/AllTests.cpp @@ -77,7 +77,6 @@ private: }; typedef IceUtil::Handle<Callback> CallbackPtr; - class StressClient : public IceUtil::Thread, public IceUtil::Monitor<IceUtil::Mutex> { public: diff --git a/cpp/test/IceGrid/deployer/AllTests.cpp b/cpp/test/IceGrid/deployer/AllTests.cpp index d5b03791891..28770a9d682 100644 --- a/cpp/test/IceGrid/deployer/AllTests.cpp +++ b/cpp/test/IceGrid/deployer/AllTests.cpp @@ -375,7 +375,6 @@ logTests(const Ice::CommunicatorPtr& comm, const AdminSessionPrx& session) cout << "ok" << endl; } - void allTests(const Ice::CommunicatorPtr& comm) { diff --git a/cpp/test/IceGrid/fileLock/test.py b/cpp/test/IceGrid/fileLock/test.py index 413675f0c36..b8e19fee6ee 100644 --- a/cpp/test/IceGrid/fileLock/test.py +++ b/cpp/test/IceGrid/fileLock/test.py @@ -19,5 +19,4 @@ class IceGridAdminTestCase(IceGridTestCase): registry.stop(current, False) print("ok") - TestSuite(__file__, [ IceGridAdminTestCase(application=None) ], runOnMainThread=True, multihost=False) diff --git a/cpp/test/IceGrid/replicaGroup/application.xml b/cpp/test/IceGrid/replicaGroup/application.xml index 74c91840a0c..0bf6c29e6b9 100644 --- a/cpp/test/IceGrid/replicaGroup/application.xml +++ b/cpp/test/IceGrid/replicaGroup/application.xml @@ -115,7 +115,6 @@ <icebox id="${id}" exe="${icebox.exe}" activation="on-demand" pwd="."> <service-instance template="Service" name="Service" replicaGroup="${replicaGroup}"/> - <!-- Dummy service with server lifetime adapter to ensure all the services are started when the server is marked as Active --> diff --git a/cpp/test/IceGrid/replication/AllTests.cpp b/cpp/test/IceGrid/replication/AllTests.cpp index 30a29cc307f..2e05ac615dc 100644 --- a/cpp/test/IceGrid/replication/AllTests.cpp +++ b/cpp/test/IceGrid/replication/AllTests.cpp @@ -1347,7 +1347,6 @@ allTests(const Ice::CommunicatorPtr& comm) } cout << "ok" << endl; - slave1Admin->shutdownNode("Node1"); removeServer(admin, "Node1"); diff --git a/cpp/test/IceGrid/session/AllTests.cpp b/cpp/test/IceGrid/session/AllTests.cpp index e5561b31317..ef9ffedad52 100644 --- a/cpp/test/IceGrid/session/AllTests.cpp +++ b/cpp/test/IceGrid/session/AllTests.cpp @@ -620,7 +620,6 @@ allTests(const Ice::CommunicatorPtr& communicator) { } - session1->destroy(); session2->destroy(); @@ -1877,7 +1876,6 @@ allTests(const Ice::CommunicatorPtr& communicator) session->finishUpdate(); appObs1->waitForUpdate(__FILE__, __LINE__); - session->startUpdate(); admin->startServer("Server"); session->finishUpdate(); @@ -1965,7 +1963,6 @@ allTests(const Ice::CommunicatorPtr& communicator) cout << "ok" << endl; } - { cout << "testing observer with direct proxy... " << flush; AdminSessionPrx session1 = registry->createAdminSession("admin1", "test1"); diff --git a/cpp/test/IceGrid/simple/AllTests.cpp b/cpp/test/IceGrid/simple/AllTests.cpp index 125216db7a9..5ac51bf028b 100644 --- a/cpp/test/IceGrid/simple/AllTests.cpp +++ b/cpp/test/IceGrid/simple/AllTests.cpp @@ -167,7 +167,6 @@ allTests(const Ice::CommunicatorPtr& communicator) } com->destroy(); - initData.properties = communicator->getProperties()->clone(); initData.properties->setProperty("Ice.Default.Locator", ""); initData.properties->setProperty("Ice.Plugin.IceLocatorDiscovery", diff --git a/cpp/test/IceSSL/certs/makecerts.py b/cpp/test/IceSSL/certs/makecerts.py index c79e8a8c614..aa385871fb4 100755 --- a/cpp/test/IceSSL/certs/makecerts.py +++ b/cpp/test/IceSSL/certs/makecerts.py @@ -175,7 +175,6 @@ if clean or not os.path.exists("dh_params512.der"): if clean or not os.path.exists("dh_params1024.der"): ca1.run("openssl", "dhparam", 1024, outform="DER", out="dh_params1024.der") - # # Create certificate with custom extensions # diff --git a/cpp/test/IceSSL/configuration/AllTests.cpp b/cpp/test/IceSSL/configuration/AllTests.cpp index e02c53be0a9..d2639da505e 100644 --- a/cpp/test/IceSSL/configuration/AllTests.cpp +++ b/cpp/test/IceSSL/configuration/AllTests.cpp @@ -727,7 +727,6 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12) string sep = ":"; #endif - #ifdef ICE_USE_OPENSSL Ice::Long openSSLVersion; { @@ -944,7 +943,6 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12) server->checkCert(clientCert->getSubjectDN(), clientCert->getIssuerDN()); #endif - // // Validate that we can get the connection info. Validate // that the certificates have the same DN. diff --git a/cpp/test/IceStorm/federation2/Makefile.mk b/cpp/test/IceStorm/federation2/Makefile.mk index f4bbc702ddb..9758f091318 100644 --- a/cpp/test/IceStorm/federation2/Makefile.mk +++ b/cpp/test/IceStorm/federation2/Makefile.mk @@ -15,5 +15,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) diff --git a/cpp/test/IceStorm/stress/Subscriber.cpp b/cpp/test/IceStorm/stress/Subscriber.cpp index d7c255f9177..7f7832e8bd6 100644 --- a/cpp/test/IceStorm/stress/Subscriber.cpp +++ b/cpp/test/IceStorm/stress/Subscriber.cpp @@ -257,7 +257,6 @@ private: int _expected; }; - class ControllerEventI: public EventI { public: diff --git a/cpp/test/IceUtil/priority/PriorityInversion.cpp b/cpp/test/IceUtil/priority/PriorityInversion.cpp index cef271f5135..9d8117e92e0 100644 --- a/cpp/test/IceUtil/priority/PriorityInversion.cpp +++ b/cpp/test/IceUtil/priority/PriorityInversion.cpp @@ -134,7 +134,6 @@ private: }; typedef IceUtil::Handle<TaskCollector> TaskCollectorPtr; - class SharedResource : public IceUtil::Shared { public: @@ -194,7 +193,6 @@ private: IceUtil::Mutex _mutex; }; - class SharedResourceRecMutex : public SharedResource { public: diff --git a/cpp/test/IceUtil/priority/TestSuite.cpp b/cpp/test/IceUtil/priority/TestSuite.cpp index 16ee2f1d05f..4b1bc6b938a 100644 --- a/cpp/test/IceUtil/priority/TestSuite.cpp +++ b/cpp/test/IceUtil/priority/TestSuite.cpp @@ -7,7 +7,6 @@ // // ********************************************************************** - #include <IceUtil/MutexProtocol.h> #include <TestSuite.h> diff --git a/cpp/test/IceUtil/priority/TimerPriority.cpp b/cpp/test/IceUtil/priority/TimerPriority.cpp index cc0b1c9f4ae..44b35acc0fd 100644 --- a/cpp/test/IceUtil/priority/TimerPriority.cpp +++ b/cpp/test/IceUtil/priority/TimerPriority.cpp @@ -15,7 +15,6 @@ using namespace std; using namespace IceUtil; - static const string priorityTestName("timer priority"); TimerPriorityTest::TimerPriorityTest() : diff --git a/cpp/test/IceUtil/stacktrace/Client.cpp b/cpp/test/IceUtil/stacktrace/Client.cpp index 73c93c54219..d616a148557 100644 --- a/cpp/test/IceUtil/stacktrace/Client.cpp +++ b/cpp/test/IceUtil/stacktrace/Client.cpp @@ -15,7 +15,6 @@ using namespace IceUtil; using namespace std; - namespace IceUtilInternal { extern bool ICE_API printStackTraces; @@ -238,14 +237,12 @@ int main(int argc, char* argv[]) break; } - cerr << "could not find `" << expected[i] << "` in " << actual[i] << endl; cerr << "Full stack is:\n" << stack << endl; test(false); } } - if(!match) { if(filename.find("StackTrace.release-vc") == 0) diff --git a/cpp/test/IceUtil/thread/MonitorRecMutexTest.cpp b/cpp/test/IceUtil/thread/MonitorRecMutexTest.cpp index 49dd5946be6..f9717ae5a1b 100644 --- a/cpp/test/IceUtil/thread/MonitorRecMutexTest.cpp +++ b/cpp/test/IceUtil/thread/MonitorRecMutexTest.cpp @@ -106,7 +106,6 @@ MonitorRecMutexTest::run() ThreadControl control; ThreadControl control2; - { Monitor<RecMutex>::Lock lock(monitor); diff --git a/cpp/test/IceUtil/timer/Client.cpp b/cpp/test/IceUtil/timer/Client.cpp index be2400d8f25..12a9b5c26bf 100644 --- a/cpp/test/IceUtil/timer/Client.cpp +++ b/cpp/test/IceUtil/timer/Client.cpp @@ -114,7 +114,6 @@ private: }; ICE_DEFINE_PTR(TestTaskPtr, TestTask); - class DestroyTask : public IceUtil::TimerTask, IceUtil::Monitor<IceUtil::Mutex> { public: diff --git a/cpp/test/IceUtil/unicode/Client.cpp b/cpp/test/IceUtil/unicode/Client.cpp index 79e515e99ed..174f970a768 100644 --- a/cpp/test/IceUtil/unicode/Client.cpp +++ b/cpp/test/IceUtil/unicode/Client.cpp @@ -272,7 +272,6 @@ main(int argc, char* argv[]) #endif - { cout << "testing error handling... "; diff --git a/cpp/test/IceUtil/uuid/Client.cpp b/cpp/test/IceUtil/uuid/Client.cpp index 0a5ceae5537..f04ef882949 100644 --- a/cpp/test/IceUtil/uuid/Client.cpp +++ b/cpp/test/IceUtil/uuid/Client.cpp @@ -84,7 +84,6 @@ public: } } - private: int _threadId; diff --git a/cpp/test/Slice/headers/slices/dir2/b.ice b/cpp/test/Slice/headers/slices/dir2/b.ice index 0c7207ccc57..5b72f38add2 100644 --- a/cpp/test/Slice/headers/slices/dir2/b.ice +++ b/cpp/test/Slice/headers/slices/dir2/b.ice @@ -1,5 +1,4 @@ - #include <dir1/a1.ice> #include <linktodir1/a2.ice> #include <linktodir1/linktoa3.ice> diff --git a/cpp/test/include/TestHelper.h b/cpp/test/include/TestHelper.h index 417afb531cc..4453e8498a7 100644 --- a/cpp/test/include/TestHelper.h +++ b/cpp/test/include/TestHelper.h @@ -18,7 +18,6 @@ namespace Test { - class MainHelper : public std::streambuf { public: diff --git a/cpp/test/ios/controller/Classes/AppDelegate.h b/cpp/test/ios/controller/Classes/AppDelegate.h index bdbf2a2e808..69088212d4b 100644 --- a/cpp/test/ios/controller/Classes/AppDelegate.h +++ b/cpp/test/ios/controller/Classes/AppDelegate.h @@ -13,5 +13,4 @@ @property (strong, nonatomic) UIWindow *window; - @end diff --git a/cpp/test/ios/controller/Classes/AppDelegate.m b/cpp/test/ios/controller/Classes/AppDelegate.m index 405da278fb7..74a582f002b 100644 --- a/cpp/test/ios/controller/Classes/AppDelegate.m +++ b/cpp/test/ios/controller/Classes/AppDelegate.m @@ -15,38 +15,31 @@ @implementation AppDelegate - - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { // Override point for customization after application launch. return YES; } - - (void)applicationWillResignActive:(UIApplication *)application { // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state. // Use this method to pause ongoing tasks, disable timers, and invalidate graphics rendering callbacks. Games should use this method to pause the game. } - - (void)applicationDidEnterBackground:(UIApplication *)application { // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later. // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits. } - - (void)applicationWillEnterForeground:(UIApplication *)application { // Called as part of the transition from the background to the active state; here you can undo many of the changes made on entering the background. } - - (void)applicationDidBecomeActive:(UIApplication *)application { // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface. } - - (void)applicationWillTerminate:(UIApplication *)application { // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:. } - @end diff --git a/cpp/test/uwp/controller/ViewController.xaml.h b/cpp/test/uwp/controller/ViewController.xaml.h index a35af555017..77852ec9bd2 100644 --- a/cpp/test/uwp/controller/ViewController.xaml.h +++ b/cpp/test/uwp/controller/ViewController.xaml.h @@ -33,7 +33,6 @@ public: ViewController(); virtual ~ViewController(); - protected: virtual void OnNavigatedTo(Windows::UI::Xaml::Navigation::NavigationEventArgs^ e) override; diff --git a/csharp/src/Ice/ACM.cs b/csharp/src/Ice/ACM.cs index cacccfb41c8..6eef3867299 100644 --- a/csharp/src/Ice/ACM.cs +++ b/csharp/src/Ice/ACM.cs @@ -232,7 +232,6 @@ namespace IceInternal } } - // // Monitor connections outside the thread synchronization, so // that connections can be added or removed during monitoring. diff --git a/csharp/src/Ice/AsyncResult.cs b/csharp/src/Ice/AsyncResult.cs index 6e4d4adddfb..12ed39c83d6 100644 --- a/csharp/src/Ice/AsyncResult.cs +++ b/csharp/src/Ice/AsyncResult.cs @@ -435,7 +435,6 @@ namespace IceInternal return check(r, operation); } - public static AsyncResultI check(Ice.AsyncResult r, string operation) { if(r == null) diff --git a/csharp/src/Ice/ConnectionI.cs b/csharp/src/Ice/ConnectionI.cs index d3150ba8321..a191988d800 100644 --- a/csharp/src/Ice/ConnectionI.cs +++ b/csharp/src/Ice/ConnectionI.cs @@ -792,7 +792,6 @@ namespace Ice return; // The request has already been or will be shortly notified of the failure. } - OutgoingMessage o = _sendStreams.FirstOrDefault(m => m.outAsync == outAsync); if(o != null) { diff --git a/csharp/src/Ice/ImplicitContextI.cs b/csharp/src/Ice/ImplicitContextI.cs index 5bd9eccedb8..efd8111530b 100644 --- a/csharp/src/Ice/ImplicitContextI.cs +++ b/csharp/src/Ice/ImplicitContextI.cs @@ -48,7 +48,6 @@ namespace Ice abstract internal Dictionary<string, string> combine(Dictionary<string, string> prxContext); } - internal class SharedImplicitContext : ImplicitContextI { public override Dictionary<string, string> getContext() @@ -105,7 +104,6 @@ namespace Ice } } - public override string put(string key, string value) { lock(this) @@ -329,7 +327,6 @@ namespace Ice } } - string val = null; if(!threadContext.TryGetValue(key, out val)) { diff --git a/csharp/src/Ice/LoggerAdminI.cs b/csharp/src/Ice/LoggerAdminI.cs index 05d3236473b..ef5ecd1fa22 100644 --- a/csharp/src/Ice/LoggerAdminI.cs +++ b/csharp/src/Ice/LoggerAdminI.cs @@ -161,7 +161,6 @@ sealed class LoggerAdminI : Ice.LoggerAdminDisp_ return logMessages.ToArray(); } - internal LoggerAdminI(Ice.Properties props, LoggerAdminLoggerI logger) { _maxLogCount = props.getPropertyAsIntWithDefault("Ice.Admin.Logger.KeepLogs", 100); @@ -431,7 +430,6 @@ sealed class LoggerAdminI : Ice.LoggerAdminDisp_ return Ice.Util.initialize(initData); } - private readonly LinkedList<Ice.LogMessage> _queue = new LinkedList<Ice.LogMessage>(); private int _logCount = 0; // non-trace messages private readonly int _maxLogCount; diff --git a/csharp/src/Ice/Network.cs b/csharp/src/Ice/Network.cs index 08ffc80a77b..59f88fa3e17 100644 --- a/csharp/src/Ice/Network.cs +++ b/csharp/src/Ice/Network.cs @@ -235,7 +235,6 @@ namespace IceInternal throw new Ice.SocketException(ex); } - if(!udp) { try @@ -726,7 +725,6 @@ namespace IceInternal return addresses; } - int retry = 5; repeatGetHostByName: diff --git a/csharp/src/Ice/OpaqueEndpointI.cs b/csharp/src/Ice/OpaqueEndpointI.cs index c52cc9c0185..b31f39a1111 100644 --- a/csharp/src/Ice/OpaqueEndpointI.cs +++ b/csharp/src/Ice/OpaqueEndpointI.cs @@ -383,7 +383,6 @@ namespace IceInternal throw new Ice.EndpointParseException("no argument provided for -v option in endpoint " + endpoint); } - try { _rawBytes = System.Convert.FromBase64String(argument); diff --git a/csharp/src/Ice/PropertiesI.cs b/csharp/src/Ice/PropertiesI.cs index eee1f52925e..6f54ca37a5c 100644 --- a/csharp/src/Ice/PropertiesI.cs +++ b/csharp/src/Ice/PropertiesI.cs @@ -131,7 +131,6 @@ namespace Ice } } - public Dictionary<string, string> getPropertiesForPrefix(string prefix) { lock(this) diff --git a/csharp/src/Ice/Proxy.cs b/csharp/src/Ice/Proxy.cs index 8141471f56d..621ecdde059 100644 --- a/csharp/src/Ice/Proxy.cs +++ b/csharp/src/Ice/Proxy.cs @@ -771,7 +771,6 @@ namespace Ice [EditorBrowsable(EditorBrowsableState.Never)] void iceWrite(OutputStream os); - /// <summary> /// Returns an scheduler object that use the Ice thread pool. /// </summary> @@ -2944,7 +2943,6 @@ namespace Ice return d; } - /// <summary> /// Returns the Slice type id of the interface or class associated /// with this proxy class. diff --git a/csharp/src/Ice/StringUtil.cs b/csharp/src/Ice/StringUtil.cs index 8fc7555dd0c..f8caee47cbb 100644 --- a/csharp/src/Ice/StringUtil.cs +++ b/csharp/src/Ice/StringUtil.cs @@ -301,7 +301,6 @@ namespace IceUtilInternal return c; } - // // Decode the character or escape sequence starting at start and appends it to result; // returns the index of the first character following the decoded character diff --git a/csharp/src/IceBox/ServiceManagerI.cs b/csharp/src/IceBox/ServiceManagerI.cs index 129fdb5a468..e1bb8edc6b2 100644 --- a/csharp/src/IceBox/ServiceManagerI.cs +++ b/csharp/src/IceBox/ServiceManagerI.cs @@ -703,7 +703,6 @@ class ServiceManagerI : ServiceManagerDisp_ throw e; } - try { info.service.start(service, communicator, info.args); diff --git a/csharp/src/IceSSL/SSLEngine.cs b/csharp/src/IceSSL/SSLEngine.cs index 119e5f97b8c..6b9dbbf5242 100644 --- a/csharp/src/IceSSL/SSLEngine.cs +++ b/csharp/src/IceSSL/SSLEngine.cs @@ -480,7 +480,6 @@ namespace IceSSL internal void verifyPeer(string address, IceSSL.ConnectionInfo info, string desc) { - if(_verifyDepthMax > 0 && info.certs != null && info.certs.Length > _verifyDepthMax) { string msg = (info.incoming ? "incoming" : "outgoing") + " connection rejected:\n" + diff --git a/csharp/test/Glacier2/application/Client.cs b/csharp/test/Glacier2/application/Client.cs index 8e36dfe1e3f..4e9df5f6d2a 100644 --- a/csharp/test/Glacier2/application/Client.cs +++ b/csharp/test/Glacier2/application/Client.cs @@ -172,6 +172,5 @@ public class Client : TestCommon.Application return app.runmain(args); } - private Ice.InitializationData _initData; } diff --git a/csharp/test/Glacier2/router/Client.cs b/csharp/test/Glacier2/router/Client.cs index 1890823c65d..4560049a2ce 100644 --- a/csharp/test/Glacier2/router/Client.cs +++ b/csharp/test/Glacier2/router/Client.cs @@ -39,7 +39,6 @@ public class Client : TestCommon.Application Console.Out.WriteLine("ok"); } - { Console.Out.Write("testing router finder... "); Console.Out.Flush(); @@ -91,7 +90,6 @@ public class Client : TestCommon.Application } } - { Console.Out.Write("trying to create session with wrong password... "); Console.Out.Flush(); diff --git a/csharp/test/Glacier2/sessionHelper/Client.cs b/csharp/test/Glacier2/sessionHelper/Client.cs index 1cfea3caaef..051676f4533 100644 --- a/csharp/test/Glacier2/sessionHelper/Client.cs +++ b/csharp/test/Glacier2/sessionHelper/Client.cs @@ -376,7 +376,6 @@ public class Client : TestCommon.Application } Console.Out.WriteLine("ok"); - Console.Out.Write("uninstalling router with communicator... "); Console.Out.Flush(); communicator().setDefaultRouter(null); @@ -389,7 +388,6 @@ public class Client : TestCommon.Application Console.Out.WriteLine("ok"); } - Ice.ProcessPrx process; { Console.Out.Write("testing checked cast for admin object... "); diff --git a/csharp/test/Ice/acm/AllTests.cs b/csharp/test/Ice/acm/AllTests.cs index b7aa777b66a..fb6858ff60b 100644 --- a/csharp/test/Ice/acm/AllTests.cs +++ b/csharp/test/Ice/acm/AllTests.cs @@ -12,7 +12,6 @@ using System.Collections.Generic; using System.Threading; using Test; - class LoggerI : Ice.Logger { public void start() diff --git a/csharp/test/Ice/admin/AllTests.cs b/csharp/test/Ice/admin/AllTests.cs index 72bba917d90..48949c44331 100644 --- a/csharp/test/Ice/admin/AllTests.cs +++ b/csharp/test/Ice/admin/AllTests.cs @@ -415,7 +415,6 @@ public class AllTests : TestCommon.AllTests } WriteLine("ok"); - Write("testing custom facet... "); Flush(); { diff --git a/csharp/test/Ice/ami/AllTests.cs b/csharp/test/Ice/ami/AllTests.cs index e6b3fad49bc..40422445f5d 100644 --- a/csharp/test/Ice/ami/AllTests.cs +++ b/csharp/test/Ice/ami/AllTests.cs @@ -1285,7 +1285,6 @@ public class AllTests : TestCommon.AllTests { } - try { r = ((Test.TestIntfPrx)p.ice_oneway()).begin_opWithResult(); @@ -3574,7 +3573,6 @@ public class AllTests : TestCommon.AllTests test(!r2.isSent() && r2.isCompleted_()); } - testController.holdAdapter(); try { diff --git a/csharp/test/Ice/assemblies/User.ice b/csharp/test/Ice/assemblies/User.ice index b5d20a9214c..13418e4328e 100644 --- a/csharp/test/Ice/assemblies/User.ice +++ b/csharp/test/Ice/assemblies/User.ice @@ -13,5 +13,4 @@ interface Registry UserInfo getUserInfo(string id) throws Core::ArgumentException; } - } diff --git a/csharp/test/Ice/binding/AllTests.cs b/csharp/test/Ice/binding/AllTests.cs index 9d462301169..a10651d2dc4 100644 --- a/csharp/test/Ice/binding/AllTests.cs +++ b/csharp/test/Ice/binding/AllTests.cs @@ -555,7 +555,6 @@ public class AllTests : TestCommon.AllTests com.deactivateObjectAdapter((RemoteObjectAdapterPrx)adapters[2]); - test(obj.getAdapterName().Equals("Adapter52")); deactivate(com, adapters); @@ -593,7 +592,6 @@ public class AllTests : TestCommon.AllTests com.deactivateObjectAdapter((RemoteObjectAdapterPrx)adapters[2]); - test(getAdapterNameWithAMI(obj).Equals("AdapterAMI52")); deactivate(com, adapters); diff --git a/csharp/test/Ice/dispatcher/AllTests.cs b/csharp/test/Ice/dispatcher/AllTests.cs index f0a69f857ed..d3b5d6934f4 100644 --- a/csharp/test/Ice/dispatcher/AllTests.cs +++ b/csharp/test/Ice/dispatcher/AllTests.cs @@ -7,7 +7,6 @@ // // ********************************************************************** - using System; using System.Diagnostics; using System.Threading.Tasks; @@ -67,7 +66,6 @@ public class AllTests : TestCommon.AllTests called(); } - public void payload() { test(Dispatcher.isDispatcherThread()); diff --git a/csharp/test/Ice/exceptions/AllTests.cs b/csharp/test/Ice/exceptions/AllTests.cs index 2627821fb7c..95b4d35a8d5 100644 --- a/csharp/test/Ice/exceptions/AllTests.cs +++ b/csharp/test/Ice/exceptions/AllTests.cs @@ -47,7 +47,6 @@ public class AllTests : TestCommon.AllTests private bool _called; } - public static ThrowerPrx allTests(TestCommon.Application app) { Ice.Communicator communicator = app.communicator(); diff --git a/csharp/test/Ice/facets/AllTests.cs b/csharp/test/Ice/facets/AllTests.cs index 29c0b3543b8..1f45c6c1017 100644 --- a/csharp/test/Ice/facets/AllTests.cs +++ b/csharp/test/Ice/facets/AllTests.cs @@ -11,7 +11,6 @@ using System; using System.Collections.Generic; using Test; - public class AllTests : TestCommon.AllTests { public static GPrx allTests(TestCommon.Application app) diff --git a/csharp/test/Ice/hash/Client.cs b/csharp/test/Ice/hash/Client.cs index 762c98711cd..951aebc4611 100644 --- a/csharp/test/Ice/hash/Client.cs +++ b/csharp/test/Ice/hash/Client.cs @@ -69,7 +69,6 @@ public class Client Ice.ObjectPrx obj = communicator.stringToProxy(sw.ToString()); List<Ice.Endpoint> endpoints = new List<Ice.Endpoint>(obj.ice_getEndpoints()); - if(seenProxy.ContainsKey(obj.GetHashCode())) { if(obj.Equals(seenProxy[obj.GetHashCode()])) diff --git a/csharp/test/Ice/hash/Test.ice b/csharp/test/Ice/hash/Test.ice index 3374261e2f9..ebfc5a71d65 100644 --- a/csharp/test/Ice/hash/Test.ice +++ b/csharp/test/Ice/hash/Test.ice @@ -12,7 +12,6 @@ module Test { - exception BaseException { } @@ -35,7 +34,6 @@ exception OtherException bool b; } - struct PointF { float x; @@ -70,7 +68,6 @@ struct Color int a; } - dictionary<int, Color> StringColorMap; struct ColorPalette @@ -78,8 +75,6 @@ struct ColorPalette StringColorMap colors; } - - class Pen { int thickness; diff --git a/csharp/test/Ice/impl/Test.ice b/csharp/test/Ice/impl/Test.ice index 8d6b9105444..ff45b172e28 100644 --- a/csharp/test/Ice/impl/Test.ice +++ b/csharp/test/Ice/impl/Test.ice @@ -145,7 +145,6 @@ interface MyClass LongSS opShortIntLongSS(ShortSS p1, IntSS p2, LongSS p3, out ShortSS p4, out IntSS p5, out LongSS p6); - DoubleSS opFloatDoubleSS(FloatSS p1, DoubleSS p2, out FloatSS p3, out DoubleSS p4); diff --git a/csharp/test/Ice/impl/TestAMD.ice b/csharp/test/Ice/impl/TestAMD.ice index 4e9d3732d02..25ee82366a7 100644 --- a/csharp/test/Ice/impl/TestAMD.ice +++ b/csharp/test/Ice/impl/TestAMD.ice @@ -143,7 +143,6 @@ dictionary<MyEnum, MyEnumS> MyEnumMyEnumSD; LongSS opShortIntLongSS(ShortSS p1, IntSS p2, LongSS p3, out ShortSS p4, out IntSS p5, out LongSS p6); - DoubleSS opFloatDoubleSS(FloatSS p1, DoubleSS p2, out FloatSS p3, out DoubleSS p4); diff --git a/csharp/test/Ice/info/AllTests.cs b/csharp/test/Ice/info/AllTests.cs index 0b05efb552f..f675223a849 100644 --- a/csharp/test/Ice/info/AllTests.cs +++ b/csharp/test/Ice/info/AllTests.cs @@ -7,7 +7,6 @@ // // ********************************************************************** - using System.Collections.Generic; using Test; diff --git a/csharp/test/Ice/interceptor/MyObjectI.cs b/csharp/test/Ice/interceptor/MyObjectI.cs index e001ea55bfe..de9a6cd2d11 100644 --- a/csharp/test/Ice/interceptor/MyObjectI.cs +++ b/csharp/test/Ice/interceptor/MyObjectI.cs @@ -72,7 +72,6 @@ class MyObjectI : Test.MyObjectDisp_ throw new MySystemException(); } - // // AMD // diff --git a/csharp/test/Ice/interceptor/Test.ice b/csharp/test/Ice/interceptor/Test.ice index 329f6593cdf..967cfcedcdc 100644 --- a/csharp/test/Ice/interceptor/Test.ice +++ b/csharp/test/Ice/interceptor/Test.ice @@ -79,5 +79,4 @@ interface MyObject } - } diff --git a/csharp/test/Ice/invoke/AllTests.cs b/csharp/test/Ice/invoke/AllTests.cs index ab1a29fc856..7f8ab692a28 100644 --- a/csharp/test/Ice/invoke/AllTests.cs +++ b/csharp/test/Ice/invoke/AllTests.cs @@ -7,12 +7,10 @@ // // ********************************************************************** - using System; using System.Collections.Generic; using System.Diagnostics; - public class AllTests : TestCommon.AllTests { private static string testString = "This is a test string"; @@ -276,7 +274,6 @@ public class AllTests : TestCommon.AllTests test(false); } - Ice.OutputStream outS = new Ice.OutputStream(communicator); outS.startEncapsulation(); outS.writeString(testString); diff --git a/csharp/test/Ice/metrics/InstrumentationI.cs b/csharp/test/Ice/metrics/InstrumentationI.cs index efa98063082..818fb68dda3 100644 --- a/csharp/test/Ice/metrics/InstrumentationI.cs +++ b/csharp/test/Ice/metrics/InstrumentationI.cs @@ -307,7 +307,6 @@ public class CommunicatorObserverI : Ice.Instrumentation.CommunicatorObserver } } - public Ice.Instrumentation.Observer getEndpointLookupObserver(Ice.Endpoint e) { @@ -384,7 +383,6 @@ public class CommunicatorObserverI : Ice.Instrumentation.CommunicatorObserver } } - /* void reset() diff --git a/csharp/test/Ice/objects/AllTests.cs b/csharp/test/Ice/objects/AllTests.cs index e61141f5daa..ba037fc748c 100644 --- a/csharp/test/Ice/objects/AllTests.cs +++ b/csharp/test/Ice/objects/AllTests.cs @@ -94,7 +94,6 @@ public class AllTests : TestCommon.AllTests communicator.addObjectFactory(new MyObjectFactory(), "TestOF"); #pragma warning restore 612, 618 - Write("testing stringToProxy... "); Flush(); String @ref = "initial:" + app.getTestEndpoint(0); diff --git a/csharp/test/Ice/operations/MyDerivedClassAMDI.cs b/csharp/test/Ice/operations/MyDerivedClassAMDI.cs index a460e24fa69..8e9cfb10629 100644 --- a/csharp/test/Ice/operations/MyDerivedClassAMDI.cs +++ b/csharp/test/Ice/operations/MyDerivedClassAMDI.cs @@ -859,7 +859,6 @@ public sealed class MyDerivedClassI : Test.MyDerivedClassDisp_ return Task.FromResult<MyStruct1>(value); } - public override Task<string[]> opStringLiteralsAsync(Ice.Current current) { diff --git a/csharp/test/Ice/operations/MyDerivedClassAMDTieI.cs b/csharp/test/Ice/operations/MyDerivedClassAMDTieI.cs index 8a87f5a26bf..e6d5c97cca0 100644 --- a/csharp/test/Ice/operations/MyDerivedClassAMDTieI.cs +++ b/csharp/test/Ice/operations/MyDerivedClassAMDTieI.cs @@ -838,7 +838,6 @@ public sealed class MyDerivedClassTieI : MyDerivedClassOperations_ return Task.FromResult<MyStruct1>(value); } - public Task<string[]> opStringLiteralsAsync(Ice.Current current) { diff --git a/csharp/test/Ice/operations/Test.ice b/csharp/test/Ice/operations/Test.ice index 3e42ac24861..ccae3dfbd4e 100644 --- a/csharp/test/Ice/operations/Test.ice +++ b/csharp/test/Ice/operations/Test.ice @@ -145,7 +145,6 @@ interface MyClass LongSS opShortIntLongSS(ShortSS p1, IntSS p2, LongSS p3, out ShortSS p4, out IntSS p5, out LongSS p6); - DoubleSS opFloatDoubleSS(FloatSS p1, DoubleSS p2, out FloatSS p3, out DoubleSS p4); diff --git a/csharp/test/Ice/operations/TestAMD.ice b/csharp/test/Ice/operations/TestAMD.ice index 4e9d3732d02..25ee82366a7 100644 --- a/csharp/test/Ice/operations/TestAMD.ice +++ b/csharp/test/Ice/operations/TestAMD.ice @@ -143,7 +143,6 @@ dictionary<MyEnum, MyEnumS> MyEnumMyEnumSD; LongSS opShortIntLongSS(ShortSS p1, IntSS p2, LongSS p3, out ShortSS p4, out IntSS p5, out LongSS p6); - DoubleSS opFloatDoubleSS(FloatSS p1, DoubleSS p2, out FloatSS p3, out DoubleSS p4); diff --git a/csharp/test/Ice/operations/Twoways.cs b/csharp/test/Ice/operations/Twoways.cs index 89179f04c39..aa4fcf05671 100644 --- a/csharp/test/Ice/operations/Twoways.cs +++ b/csharp/test/Ice/operations/Twoways.cs @@ -136,11 +136,9 @@ class Twoways p.ice_ping(); - test(Test.MyClassPrxHelper.ice_staticId().Equals(Test.MyClassDisp_.ice_staticId())); test(Ice.ObjectPrxHelper.ice_staticId().Equals(Ice.ObjectImpl.ice_staticId())); - test(p.ice_isA(Test.MyClassDisp_.ice_staticId())); test(p.ice_id().Equals(Test.MyDerivedClassDisp_.ice_staticId())); @@ -1526,7 +1524,6 @@ class Twoways test(p.opStringS2(null).Length == 0); test(p.opByteBoolD2(null).Count == 0); - Test.MyDerivedClassPrx d = Test.MyDerivedClassPrxHelper.uncheckedCast(p); Test.MyStruct1 s = new Test.MyStruct1(); s.tesT = "Test.MyStruct1.s"; diff --git a/csharp/test/Ice/optional/AllTests.cs b/csharp/test/Ice/optional/AllTests.cs index 2de88ac6626..b31f9d901f7 100644 --- a/csharp/test/Ice/optional/AllTests.cs +++ b/csharp/test/Ice/optional/AllTests.cs @@ -2409,7 +2409,6 @@ public class AllTests : TestCommon.AllTests } } - private class TestValueReader : Ice.ValueReader { public override void read(Ice.InputStream @in) diff --git a/csharp/test/Ice/properties/config/escapes.cfg b/csharp/test/Ice/properties/config/escapes.cfg index bd7c16643d9..a9d91a0a19f 100644 --- a/csharp/test/Ice/properties/config/escapes.cfg +++ b/csharp/test/Ice/properties/config/escapes.cfg @@ -22,7 +22,6 @@ foo\=bar=1 # Name is "foo=bar", value is "1" foo\#bar = 2 # Name is "foo#bar", value is "2" foo bar =3 # Name is "foo bar", value is "3" - A=1 # Name is "A", value is "1" B= 2 3 4 # Name is "B", value is "2 3 4" C=5=\#6 # 7 # Name is "C", value is "5=#6" diff --git a/csharp/test/Ice/proxy/AllTests.cs b/csharp/test/Ice/proxy/AllTests.cs index e272f357b7b..07b38a31b9c 100644 --- a/csharp/test/Ice/proxy/AllTests.cs +++ b/csharp/test/Ice/proxy/AllTests.cs @@ -673,7 +673,6 @@ public class AllTests : TestCommon.AllTests { } - WriteLine("ok"); Write("testing proxy comparison... "); diff --git a/csharp/test/Ice/proxy/Test.ice b/csharp/test/Ice/proxy/Test.ice index 7ad081172b2..711ed0289f1 100644 --- a/csharp/test/Ice/proxy/Test.ice +++ b/csharp/test/Ice/proxy/Test.ice @@ -14,7 +14,6 @@ module Test { - interface MyClass { void shutdown(); diff --git a/csharp/test/Ice/proxy/TestAMD.ice b/csharp/test/Ice/proxy/TestAMD.ice index ab0cbeec7f2..2af61997486 100644 --- a/csharp/test/Ice/proxy/TestAMD.ice +++ b/csharp/test/Ice/proxy/TestAMD.ice @@ -14,7 +14,6 @@ module Test { - ["amd"] interface MyClass { void shutdown(); diff --git a/csharp/test/Ice/seqMapping/Twoways.cs b/csharp/test/Ice/seqMapping/Twoways.cs index 7ddb3065133..f8ba78a86d3 100644 --- a/csharp/test/Ice/seqMapping/Twoways.cs +++ b/csharp/test/Ice/seqMapping/Twoways.cs @@ -814,7 +814,6 @@ class Twoways Stack<S> o; Stack<S> r; - r = p.opSStructS(i, out o); test(Ice.CollectionComparer.Equals(i, o)); @@ -890,7 +889,6 @@ class Twoways Stack<SD> o; Stack<SD> r; - r = p.opSStructSD(i, out o); test(Ice.CollectionComparer.Equals(i, o)); diff --git a/csharp/test/Ice/stream/AllTests.cs b/csharp/test/Ice/stream/AllTests.cs index 82c4758c065..394f13d7449 100644 --- a/csharp/test/Ice/stream/AllTests.cs +++ b/csharp/test/Ice/stream/AllTests.cs @@ -554,7 +554,6 @@ public class AllTests : TestCommon.AllTests myInterfaceArray[i] = new Ice.InterfaceByValue("::Test::MyInterface"); } - { outS = new Ice.OutputStream(communicator); MyClassSHelper.write(outS, myClassArray); diff --git a/csharp/test/Ice/stream/Test.ice b/csharp/test/Ice/stream/Test.ice index 5671c834eed..f8b4913a4f0 100644 --- a/csharp/test/Ice/stream/Test.ice +++ b/csharp/test/Ice/stream/Test.ice @@ -139,13 +139,11 @@ sequence<string> StringQueue; ["clr:generic:Queue"] sequence<SmallStruct> SmallStructQueue; - ["clr:generic:List"] sequence<Ice::StringSeq> StringSList; ["clr:generic:Stack"] sequence<Ice::StringSeq> StringSStack; - ["clr:generic:SortedDictionary"] dictionary<string, string> SortedStringStringD; diff --git a/csharp/test/Ice/timeout/AllTests.cs b/csharp/test/Ice/timeout/AllTests.cs index dd739abb307..f4268233a73 100644 --- a/csharp/test/Ice/timeout/AllTests.cs +++ b/csharp/test/Ice/timeout/AllTests.cs @@ -467,7 +467,6 @@ public class AllTests : TestCommon.AllTests { } - adapter.destroy(); } WriteLine("ok"); diff --git a/csharp/test/IceBox/configuration/config.service1-2 b/csharp/test/IceBox/configuration/config.service1-2 index 835acbadfc9..e7f07a370f2 100644 --- a/csharp/test/IceBox/configuration/config.service1-2 +++ b/csharp/test/IceBox/configuration/config.service1-2 @@ -7,5 +7,4 @@ Service1.ArgProp=1 OverrideMe=2 UnsetMe= - Ice.PrintAdapterReady=0 diff --git a/csharp/test/IceDiscovery/simple/Test.ice b/csharp/test/IceDiscovery/simple/Test.ice index bcb14d687e7..14134f6b56d 100644 --- a/csharp/test/IceDiscovery/simple/Test.ice +++ b/csharp/test/IceDiscovery/simple/Test.ice @@ -9,7 +9,6 @@ #pragma once - [["java:package:test.IceDiscovery.simple"]] module Test { diff --git a/csharp/test/IceSSL/configuration/AllTests.cs b/csharp/test/IceSSL/configuration/AllTests.cs index 043d34fb27e..cafd4829cec 100644 --- a/csharp/test/IceSSL/configuration/AllTests.cs +++ b/csharp/test/IceSSL/configuration/AllTests.cs @@ -123,7 +123,6 @@ public class AllTests X509Certificate2 caCert1 = new X509Certificate2(caCert1File); X509Certificate2 caCert2 = new X509Certificate2(caCert2File); - test(Enumerable.SequenceEqual(IceSSL.Util.createCertificate(File.ReadAllText(caCert1File)).RawData, caCert1.RawData)); test(Enumerable.SequenceEqual(IceSSL.Util.createCertificate(File.ReadAllText(caCert2File)).RawData, caCert2.RawData)); @@ -526,7 +525,6 @@ public class AllTests fact.destroyServer(server); comm.destroy(); - // // Verify that IceSSL.CheckCertName has no effect in a server. // diff --git a/java-compat/src/Ice/src/main/java/Ice/CommunicatorI.java b/java-compat/src/Ice/src/main/java/Ice/CommunicatorI.java index 102deb2e229..1bfa8fd1c3b 100644 --- a/java-compat/src/Ice/src/main/java/Ice/CommunicatorI.java +++ b/java-compat/src/Ice/src/main/java/Ice/CommunicatorI.java @@ -301,7 +301,6 @@ public final class CommunicatorI implements Communicator ri.waitForResponseOrUserEx(); } - @Override public ObjectPrx createAdmin(ObjectAdapter adminAdapter, Identity adminId) diff --git a/java-compat/src/Ice/src/main/java/Ice/LoggerI.java b/java-compat/src/Ice/src/main/java/Ice/LoggerI.java index bb650553fe7..999c8ce5405 100644 --- a/java-compat/src/Ice/src/main/java/Ice/LoggerI.java +++ b/java-compat/src/Ice/src/main/java/Ice/LoggerI.java @@ -108,7 +108,6 @@ public class LoggerI implements Logger write(s, true); } - @Override public String getPrefix() diff --git a/java-compat/src/Ice/src/main/java/Ice/ObjectAdapterI.java b/java-compat/src/Ice/src/main/java/Ice/ObjectAdapterI.java index 2e817cf9bff..98cd90ca3d6 100644 --- a/java-compat/src/Ice/src/main/java/Ice/ObjectAdapterI.java +++ b/java-compat/src/Ice/src/main/java/Ice/ObjectAdapterI.java @@ -160,7 +160,6 @@ public final class ObjectAdapterI implements ObjectAdapter } } - @Override public void deactivate() @@ -705,7 +704,6 @@ public final class ObjectAdapterI implements ObjectAdapter } } - public boolean isLocal(ObjectPrx proxy) { diff --git a/java-compat/src/Ice/src/main/java/Ice/SysLoggerI.java b/java-compat/src/Ice/src/main/java/Ice/SysLoggerI.java index 672ed9cae1c..eac20878110 100644 --- a/java-compat/src/Ice/src/main/java/Ice/SysLoggerI.java +++ b/java-compat/src/Ice/src/main/java/Ice/SysLoggerI.java @@ -163,7 +163,6 @@ public final class SysLoggerI implements Logger log(LOG_ERR, message); } - @Override public String getPrefix() diff --git a/java-compat/src/Ice/src/main/java/IceInternal/FactoryACMMonitor.java b/java-compat/src/Ice/src/main/java/IceInternal/FactoryACMMonitor.java index 44da4fcf3dc..f9ebb993713 100644 --- a/java-compat/src/Ice/src/main/java/IceInternal/FactoryACMMonitor.java +++ b/java-compat/src/Ice/src/main/java/IceInternal/FactoryACMMonitor.java @@ -192,7 +192,6 @@ class FactoryACMMonitor implements ACMMonitor } } - // // Monitor connections outside the thread synchronization, so // that connections can be added or removed during monitoring. diff --git a/java-compat/src/Ice/src/main/java/IceInternal/IPEndpointI.java b/java-compat/src/Ice/src/main/java/IceInternal/IPEndpointI.java index e67a02ff611..62275da0227 100644 --- a/java-compat/src/Ice/src/main/java/IceInternal/IPEndpointI.java +++ b/java-compat/src/Ice/src/main/java/IceInternal/IPEndpointI.java @@ -159,7 +159,6 @@ public abstract class IPEndpointI extends EndpointI _instance.preferIPv6(), true); - java.util.ArrayList<EndpointI> endpoints = new java.util.ArrayList<>(); if(addresses.size() == 1) { diff --git a/java-compat/src/Ice/src/main/java/IceInternal/LoggerAdminI.java b/java-compat/src/Ice/src/main/java/IceInternal/LoggerAdminI.java index fc9a6120dd6..685d5bb20df 100644 --- a/java-compat/src/Ice/src/main/java/IceInternal/LoggerAdminI.java +++ b/java-compat/src/Ice/src/main/java/IceInternal/LoggerAdminI.java @@ -166,7 +166,6 @@ final class LoggerAdminI extends Ice._LoggerAdminDisp return logMessages.toArray(new Ice.LogMessage[0]); } - LoggerAdminI(Ice.Properties props, LoggerAdminLoggerI logger) { _maxLogCount = props.getPropertyAsIntWithDefault("Ice.Admin.Logger.KeepLogs", 100); @@ -420,7 +419,6 @@ final class LoggerAdminI extends Ice._LoggerAdminDisp return Ice.Util.initialize(initData); } - private final java.util.List<Ice.LogMessage> _queue = new java.util.LinkedList<Ice.LogMessage>(); private int _logCount = 0; // non-trace messages private final int _maxLogCount; diff --git a/java-compat/src/Ice/src/main/java/IceInternal/ObjectAdapterFactory.java b/java-compat/src/Ice/src/main/java/IceInternal/ObjectAdapterFactory.java index c73ca6d4cdb..3ded667ea44 100644 --- a/java-compat/src/Ice/src/main/java/IceInternal/ObjectAdapterFactory.java +++ b/java-compat/src/Ice/src/main/java/IceInternal/ObjectAdapterFactory.java @@ -46,7 +46,6 @@ public final class ObjectAdapterFactory } } - public void waitForShutdown() { diff --git a/java-compat/src/Ice/src/main/java/IceInternal/PropertyNames.java b/java-compat/src/Ice/src/main/java/IceInternal/PropertyNames.java index b9145e5445f..316c60073be 100644 --- a/java-compat/src/Ice/src/main/java/IceInternal/PropertyNames.java +++ b/java-compat/src/Ice/src/main/java/IceInternal/PropertyNames.java @@ -1296,7 +1296,6 @@ public final class PropertyNames null }; - public static final Property[] validProps[] = { IceProps, diff --git a/java-compat/src/Ice/src/main/java/IceSSL/SSLEngine.java b/java-compat/src/Ice/src/main/java/IceSSL/SSLEngine.java index 70f7152dc9e..234f8fd83fe 100644 --- a/java-compat/src/Ice/src/main/java/IceSSL/SSLEngine.java +++ b/java-compat/src/Ice/src/main/java/IceSSL/SSLEngine.java @@ -836,7 +836,6 @@ class SSLEngine } } - if(incoming) { if(_verifyPeer == 0) diff --git a/java-compat/src/Ice/src/main/java/IceUtilInternal/Options.java b/java-compat/src/Ice/src/main/java/IceUtilInternal/Options.java index 68d3a7a95da..4c60ce1d92f 100644 --- a/java-compat/src/Ice/src/main/java/IceUtilInternal/Options.java +++ b/java-compat/src/Ice/src/main/java/IceUtilInternal/Options.java @@ -399,5 +399,4 @@ public final class Options return vec.toArray(new String[0]); } - } diff --git a/java-compat/src/Ice/src/main/java/IceUtilInternal/StringUtil.java b/java-compat/src/Ice/src/main/java/IceUtilInternal/StringUtil.java index b5f4322d2c5..b7607fa2b67 100644 --- a/java-compat/src/Ice/src/main/java/IceUtilInternal/StringUtil.java +++ b/java-compat/src/Ice/src/main/java/IceUtilInternal/StringUtil.java @@ -587,7 +587,6 @@ public final class StringUtil } } - // // Join a list of strings using the given delimiter. // diff --git a/java-compat/src/IceBox/src/main/java/IceBox/ServiceManagerI.java b/java-compat/src/IceBox/src/main/java/IceBox/ServiceManagerI.java index a5d621d8ca4..ecbf8360ecb 100644 --- a/java-compat/src/IceBox/src/main/java/IceBox/ServiceManagerI.java +++ b/java-compat/src/IceBox/src/main/java/IceBox/ServiceManagerI.java @@ -1162,7 +1162,6 @@ public class ServiceManagerI extends _ServiceManagerDisp } } - private Ice.Communicator _communicator; private boolean _adminEnabled = false; private java.util.Set<String> _adminFacetFilter; diff --git a/java-compat/test/src/main/java/test/Glacier2/application/Client.java b/java-compat/test/src/main/java/test/Glacier2/application/Client.java index 197e9f4e204..1135709ecd5 100644 --- a/java-compat/test/src/main/java/test/Glacier2/application/Client.java +++ b/java-compat/test/src/main/java/test/Glacier2/application/Client.java @@ -123,7 +123,6 @@ public class Client extends test.Util.Application { } - return 0; } diff --git a/java-compat/test/src/main/java/test/Glacier2/application/Server.java b/java-compat/test/src/main/java/test/Glacier2/application/Server.java index 6fa7a707d2b..fe29c2c58ba 100644 --- a/java-compat/test/src/main/java/test/Glacier2/application/Server.java +++ b/java-compat/test/src/main/java/test/Glacier2/application/Server.java @@ -25,7 +25,6 @@ public class Server extends test.Util.Application return 0; } - protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = super.getInitData(argsH); diff --git a/java-compat/test/src/main/java/test/Glacier2/router/Client.java b/java-compat/test/src/main/java/test/Glacier2/router/Client.java index bf4dc503acb..3f9b3919ea3 100644 --- a/java-compat/test/src/main/java/test/Glacier2/router/Client.java +++ b/java-compat/test/src/main/java/test/Glacier2/router/Client.java @@ -17,7 +17,6 @@ import test.Glacier2.router.Test.CallbackPrxHelper; import test.Glacier2.router.Test.CallbackReceiverPrx; import test.Glacier2.router.Test.CallbackReceiverPrxHelper; - public class Client extends test.Util.Application { private static void diff --git a/java-compat/test/src/main/java/test/Glacier2/router/Server.java b/java-compat/test/src/main/java/test/Glacier2/router/Server.java index 5c1de641ca4..8ada7a01554 100644 --- a/java-compat/test/src/main/java/test/Glacier2/router/Server.java +++ b/java-compat/test/src/main/java/test/Glacier2/router/Server.java @@ -29,7 +29,6 @@ public class Server extends test.Util.Application return 0; } - protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = super.getInitData(argsH); diff --git a/java-compat/test/src/main/java/test/Glacier2/sessionHelper/Client.java b/java-compat/test/src/main/java/test/Glacier2/sessionHelper/Client.java index bc48eddaa92..964b1b77ce7 100644 --- a/java-compat/test/src/main/java/test/Glacier2/sessionHelper/Client.java +++ b/java-compat/test/src/main/java/test/Glacier2/sessionHelper/Client.java @@ -422,7 +422,6 @@ public class Client extends test.Util.Application } out.println("ok"); - out.print("uninstalling router with communicator... "); out.flush(); communicator().setDefaultRouter(null); @@ -435,7 +434,6 @@ public class Client extends test.Util.Application out.println("ok"); } - Ice.ProcessPrx process; { out.print("testing checked cast for admin object... "); diff --git a/java-compat/test/src/main/java/test/Glacier2/sessionHelper/Server.java b/java-compat/test/src/main/java/test/Glacier2/sessionHelper/Server.java index 901246ebb4d..56a90fcabf0 100644 --- a/java-compat/test/src/main/java/test/Glacier2/sessionHelper/Server.java +++ b/java-compat/test/src/main/java/test/Glacier2/sessionHelper/Server.java @@ -25,7 +25,6 @@ public class Server extends test.Util.Application return 0; } - protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = super.getInitData(argsH); diff --git a/java-compat/test/src/main/java/test/Ice/adapterDeactivation/Client.java b/java-compat/test/src/main/java/test/Ice/adapterDeactivation/Client.java index 9030a28cc19..69d96f354a1 100644 --- a/java-compat/test/src/main/java/test/Ice/adapterDeactivation/Client.java +++ b/java-compat/test/src/main/java/test/Ice/adapterDeactivation/Client.java @@ -25,7 +25,6 @@ public class Client extends test.Util.Application return initData; } - public static void main(String[] args) { diff --git a/java-compat/test/src/main/java/test/Ice/ami/AMI.java b/java-compat/test/src/main/java/test/Ice/ami/AMI.java index 3f056813136..ab4069cbd29 100644 --- a/java-compat/test/src/main/java/test/Ice/ami/AMI.java +++ b/java-compat/test/src/main/java/test/Ice/ami/AMI.java @@ -1192,7 +1192,6 @@ public class AMI { } - try { r = ((TestIntfPrx)p.ice_oneway()).begin_opWithResult(); diff --git a/java-compat/test/src/main/java/test/Ice/checksum/Client.java b/java-compat/test/src/main/java/test/Ice/checksum/Client.java index b1a76865dec..9a6010bcf27 100644 --- a/java-compat/test/src/main/java/test/Ice/checksum/Client.java +++ b/java-compat/test/src/main/java/test/Ice/checksum/Client.java @@ -23,7 +23,6 @@ public class Client extends test.Util.Application return 0; } - @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { diff --git a/java-compat/test/src/main/java/test/Ice/exceptions/DummyLogger.java b/java-compat/test/src/main/java/test/Ice/exceptions/DummyLogger.java index 6bebb1dbfb5..68e0c205274 100644 --- a/java-compat/test/src/main/java/test/Ice/exceptions/DummyLogger.java +++ b/java-compat/test/src/main/java/test/Ice/exceptions/DummyLogger.java @@ -9,7 +9,6 @@ package test.Ice.exceptions; - public final class DummyLogger implements Ice.Logger { @Override diff --git a/java-compat/test/src/main/java/test/Ice/exceptions/EmptyI.java b/java-compat/test/src/main/java/test/Ice/exceptions/EmptyI.java index 982d113c320..26b44dd96dc 100644 --- a/java-compat/test/src/main/java/test/Ice/exceptions/EmptyI.java +++ b/java-compat/test/src/main/java/test/Ice/exceptions/EmptyI.java @@ -11,7 +11,6 @@ package test.Ice.exceptions; import test.Ice.exceptions.Test._EmptyDisp; - public final class EmptyI extends _EmptyDisp { } diff --git a/java-compat/test/src/main/java/test/Ice/exceptions/ServantLocatorI.java b/java-compat/test/src/main/java/test/Ice/exceptions/ServantLocatorI.java index 6250f4d3ff1..cfb0a8d690d 100644 --- a/java-compat/test/src/main/java/test/Ice/exceptions/ServantLocatorI.java +++ b/java-compat/test/src/main/java/test/Ice/exceptions/ServantLocatorI.java @@ -9,7 +9,6 @@ package test.Ice.exceptions; - public final class ServantLocatorI implements Ice.ServantLocator { @Override diff --git a/java-compat/test/src/main/java/test/Ice/exceptions/ValueFactoryI.java b/java-compat/test/src/main/java/test/Ice/exceptions/ValueFactoryI.java index 87f6ab4bce0..402a4ee8c57 100644 --- a/java-compat/test/src/main/java/test/Ice/exceptions/ValueFactoryI.java +++ b/java-compat/test/src/main/java/test/Ice/exceptions/ValueFactoryI.java @@ -9,7 +9,6 @@ package test.Ice.exceptions; - public final class ValueFactoryI implements Ice.ValueFactory { @Override diff --git a/java-compat/test/src/main/java/test/Ice/faultTolerance/Client.java b/java-compat/test/src/main/java/test/Ice/faultTolerance/Client.java index 6161107f527..c14f09cfc61 100644 --- a/java-compat/test/src/main/java/test/Ice/faultTolerance/Client.java +++ b/java-compat/test/src/main/java/test/Ice/faultTolerance/Client.java @@ -11,7 +11,6 @@ package test.Ice.faultTolerance; import java.io.PrintWriter; - public class Client extends test.Util.Application { private static void diff --git a/java-compat/test/src/main/java/test/Ice/hash/Test.ice b/java-compat/test/src/main/java/test/Ice/hash/Test.ice index 27a1303c1c0..f49574e6282 100644 --- a/java-compat/test/src/main/java/test/Ice/hash/Test.ice +++ b/java-compat/test/src/main/java/test/Ice/hash/Test.ice @@ -47,7 +47,6 @@ struct Color int a; } - dictionary<int, Color> StringColorMap; struct ColorPalette diff --git a/java-compat/test/src/main/java/test/Ice/hold/HoldI.java b/java-compat/test/src/main/java/test/Ice/hold/HoldI.java index 1410c466fdb..1d441f48bf1 100644 --- a/java-compat/test/src/main/java/test/Ice/hold/HoldI.java +++ b/java-compat/test/src/main/java/test/Ice/hold/HoldI.java @@ -90,7 +90,6 @@ public final class HoldI extends _HoldDisp }, 0); } - @Override public int set(int value, int delay, Ice.Current current) diff --git a/java-compat/test/src/main/java/test/Ice/impl/Test.ice b/java-compat/test/src/main/java/test/Ice/impl/Test.ice index 1c7cdc16410..b845e3f5fa5 100644 --- a/java-compat/test/src/main/java/test/Ice/impl/Test.ice +++ b/java-compat/test/src/main/java/test/Ice/impl/Test.ice @@ -144,7 +144,6 @@ interface MyClass LongSS opShortIntLongSS(ShortSS p1, IntSS p2, LongSS p3, out ShortSS p4, out IntSS p5, out LongSS p6); - DoubleSS opFloatDoubleSS(FloatSS p1, DoubleSS p2, out FloatSS p3, out DoubleSS p4); diff --git a/java-compat/test/src/main/java/test/Ice/impl/TestAMD.ice b/java-compat/test/src/main/java/test/Ice/impl/TestAMD.ice index 1065ad60459..49e4c1b483c 100644 --- a/java-compat/test/src/main/java/test/Ice/impl/TestAMD.ice +++ b/java-compat/test/src/main/java/test/Ice/impl/TestAMD.ice @@ -144,7 +144,6 @@ dictionary<MyEnum, MyEnumS> MyEnumMyEnumSD; LongSS opShortIntLongSS(ShortSS p1, IntSS p2, LongSS p3, out ShortSS p4, out IntSS p5, out LongSS p6); - DoubleSS opFloatDoubleSS(FloatSS p1, DoubleSS p2, out FloatSS p3, out DoubleSS p4); diff --git a/java-compat/test/src/main/java/test/Ice/interceptor/Client.java b/java-compat/test/src/main/java/test/Ice/interceptor/Client.java index 0aa3de1198c..06cb870b89f 100644 --- a/java-compat/test/src/main/java/test/Ice/interceptor/Client.java +++ b/java-compat/test/src/main/java/test/Ice/interceptor/Client.java @@ -240,7 +240,6 @@ public class Client extends test.Util.Application return rs; } - @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { diff --git a/java-compat/test/src/main/java/test/Ice/interceptor/MyObjectI.java b/java-compat/test/src/main/java/test/Ice/interceptor/MyObjectI.java index 4affa6446da..464fd01ac09 100644 --- a/java-compat/test/src/main/java/test/Ice/interceptor/MyObjectI.java +++ b/java-compat/test/src/main/java/test/Ice/interceptor/MyObjectI.java @@ -62,7 +62,6 @@ class MyObjectI extends _MyObjectDisp throw new MySystemException(); } - // // AMD // diff --git a/java-compat/test/src/main/java/test/Ice/interceptor/MySystemException.java b/java-compat/test/src/main/java/test/Ice/interceptor/MySystemException.java index f0468c4b908..c57a95520f9 100644 --- a/java-compat/test/src/main/java/test/Ice/interceptor/MySystemException.java +++ b/java-compat/test/src/main/java/test/Ice/interceptor/MySystemException.java @@ -9,7 +9,6 @@ package test.Ice.interceptor; - public class MySystemException extends Ice.SystemException { public MySystemException() diff --git a/java-compat/test/src/main/java/test/Ice/interceptor/Test.ice b/java-compat/test/src/main/java/test/Ice/interceptor/Test.ice index b422c705821..9735260193a 100644 --- a/java-compat/test/src/main/java/test/Ice/interceptor/Test.ice +++ b/java-compat/test/src/main/java/test/Ice/interceptor/Test.ice @@ -80,5 +80,4 @@ interface MyObject } - } diff --git a/java-compat/test/src/main/java/test/Ice/interrupt/TestI.java b/java-compat/test/src/main/java/test/Ice/interrupt/TestI.java index 7d1af9a6598..ef35ad7e987 100644 --- a/java-compat/test/src/main/java/test/Ice/interrupt/TestI.java +++ b/java-compat/test/src/main/java/test/Ice/interrupt/TestI.java @@ -29,7 +29,6 @@ public class TestI extends test.Ice.interrupt.Test._TestIntfDisp throw new Ice.UnknownException(); } - @Override public void sleep(int to, Ice.Current current) diff --git a/java-compat/test/src/main/java/test/Ice/location/HelloI.java b/java-compat/test/src/main/java/test/Ice/location/HelloI.java index 8975e5d15ae..712790bc681 100644 --- a/java-compat/test/src/main/java/test/Ice/location/HelloI.java +++ b/java-compat/test/src/main/java/test/Ice/location/HelloI.java @@ -11,7 +11,6 @@ package test.Ice.location; import test.Ice.location.Test._HelloDisp; - public class HelloI extends _HelloDisp { @Override diff --git a/java-compat/test/src/main/java/test/Ice/location/ServerManagerI.java b/java-compat/test/src/main/java/test/Ice/location/ServerManagerI.java index 6e68fc872ef..7ab0e97bafa 100644 --- a/java-compat/test/src/main/java/test/Ice/location/ServerManagerI.java +++ b/java-compat/test/src/main/java/test/Ice/location/ServerManagerI.java @@ -12,7 +12,6 @@ package test.Ice.location; import test.Ice.location.Test._ServerManagerDisp; - public class ServerManagerI extends _ServerManagerDisp { ServerManagerI(ServerLocatorRegistry registry, Ice.InitializationData initData, test.Util.Application app) diff --git a/java-compat/test/src/main/java/test/Ice/location/TestI.java b/java-compat/test/src/main/java/test/Ice/location/TestI.java index aa272cb7f3f..76f30f9f13d 100644 --- a/java-compat/test/src/main/java/test/Ice/location/TestI.java +++ b/java-compat/test/src/main/java/test/Ice/location/TestI.java @@ -13,7 +13,6 @@ import test.Ice.location.Test.HelloPrx; import test.Ice.location.Test.HelloPrxHelper; import test.Ice.location.Test._TestIntfDisp; - public class TestI extends _TestIntfDisp { TestI(Ice.ObjectAdapter adapter1, Ice.ObjectAdapter adapter2, ServerLocatorRegistry registry) diff --git a/java-compat/test/src/main/java/test/Ice/metrics/CommunicatorObserverI.java b/java-compat/test/src/main/java/test/Ice/metrics/CommunicatorObserverI.java index 5506c30d36c..0f6083987bf 100644 --- a/java-compat/test/src/main/java/test/Ice/metrics/CommunicatorObserverI.java +++ b/java-compat/test/src/main/java/test/Ice/metrics/CommunicatorObserverI.java @@ -39,7 +39,6 @@ class CommunicatorObserverI implements Ice.Instrumentation.CommunicatorObserver return connectionEstablishmentObserver; } - @Override synchronized public Ice.Instrumentation.Observer getEndpointLookupObserver(Ice.Endpoint e) diff --git a/java-compat/test/src/main/java/test/Ice/metrics/InvocationObserverI.java b/java-compat/test/src/main/java/test/Ice/metrics/InvocationObserverI.java index e51c3c24c5d..889288e72ca 100644 --- a/java-compat/test/src/main/java/test/Ice/metrics/InvocationObserverI.java +++ b/java-compat/test/src/main/java/test/Ice/metrics/InvocationObserverI.java @@ -54,7 +54,6 @@ class InvocationObserverI extends ObserverI implements Ice.Instrumentation.Invoc return remoteObserver; } - @Override public synchronized Ice.Instrumentation.CollocatedObserver getCollocatedObserver(Ice.ObjectAdapter adapter, int a, int b) diff --git a/java-compat/test/src/main/java/test/Ice/operations/Test.ice b/java-compat/test/src/main/java/test/Ice/operations/Test.ice index 7acebb6b0ba..d747fb15f19 100644 --- a/java-compat/test/src/main/java/test/Ice/operations/Test.ice +++ b/java-compat/test/src/main/java/test/Ice/operations/Test.ice @@ -144,7 +144,6 @@ interface MyClass LongSS opShortIntLongSS(ShortSS p1, IntSS p2, LongSS p3, out ShortSS p4, out IntSS p5, out LongSS p6); - DoubleSS opFloatDoubleSS(FloatSS p1, DoubleSS p2, out FloatSS p3, out DoubleSS p4); diff --git a/java-compat/test/src/main/java/test/Ice/operations/TestAMD.ice b/java-compat/test/src/main/java/test/Ice/operations/TestAMD.ice index 515e2d8687c..17aeb247f7c 100644 --- a/java-compat/test/src/main/java/test/Ice/operations/TestAMD.ice +++ b/java-compat/test/src/main/java/test/Ice/operations/TestAMD.ice @@ -144,7 +144,6 @@ dictionary<MyEnum, MyEnumS> MyEnumMyEnumSD; LongSS opShortIntLongSS(ShortSS p1, IntSS p2, LongSS p3, out ShortSS p4, out IntSS p5, out LongSS p6); - DoubleSS opFloatDoubleSS(FloatSS p1, DoubleSS p2, out FloatSS p3, out DoubleSS p4); diff --git a/java-compat/test/src/main/java/test/Ice/operations/Twoways.java b/java-compat/test/src/main/java/test/Ice/operations/Twoways.java index ba4bf97ee52..acc34c1cea7 100644 --- a/java-compat/test/src/main/java/test/Ice/operations/Twoways.java +++ b/java-compat/test/src/main/java/test/Ice/operations/Twoways.java @@ -1393,7 +1393,6 @@ class Twoways StringStringSDHolder _do = new StringStringSDHolder(); java.util.Map<String, String[]> ro = p.opStringStringSD(sdi1, sdi2, _do); - test(_do.value.size() == 1); test(_do.value.get("ghi").length== 2); test(_do.value.get("ghi")[0].equals("and")); @@ -1584,7 +1583,6 @@ class Twoways test(p.opStringS2(null).length == 0); test(p.opByteBoolD2(null).size() == 0); - MyDerivedClassPrx d = MyDerivedClassPrxHelper.uncheckedCast(p); MyStruct1 s = new MyStruct1(); s.tesT = "Test.MyStruct1.s"; diff --git a/java-compat/test/src/main/java/test/Ice/properties/config/escapes.cfg b/java-compat/test/src/main/java/test/Ice/properties/config/escapes.cfg index bd7c16643d9..a9d91a0a19f 100644 --- a/java-compat/test/src/main/java/test/Ice/properties/config/escapes.cfg +++ b/java-compat/test/src/main/java/test/Ice/properties/config/escapes.cfg @@ -22,7 +22,6 @@ foo\=bar=1 # Name is "foo=bar", value is "1" foo\#bar = 2 # Name is "foo#bar", value is "2" foo bar =3 # Name is "foo bar", value is "3" - A=1 # Name is "A", value is "1" B= 2 3 4 # Name is "B", value is "2 3 4" C=5=\#6 # 7 # Name is "C", value is "5=#6" diff --git a/java-compat/test/src/main/java/test/Ice/stream/Client.java b/java-compat/test/src/main/java/test/Ice/stream/Client.java index 2b13c8779e9..6cadf05e10b 100644 --- a/java-compat/test/src/main/java/test/Ice/stream/Client.java +++ b/java-compat/test/src/main/java/test/Ice/stream/Client.java @@ -789,7 +789,6 @@ public class Client extends test.Util.Application test(dict2.equals(dict)); } - { java.util.Map<Long, Float> dict = new java.util.HashMap<Long, Float>(); dict.put((long)123809828, 0.51f); diff --git a/java-compat/test/src/main/java/test/Ice/timeout/TimeoutI.java b/java-compat/test/src/main/java/test/Ice/timeout/TimeoutI.java index 1e1fd890d9f..83e9375d0b3 100644 --- a/java-compat/test/src/main/java/test/Ice/timeout/TimeoutI.java +++ b/java-compat/test/src/main/java/test/Ice/timeout/TimeoutI.java @@ -10,7 +10,6 @@ package test.Ice.timeout; import test.Ice.timeout.Test._TimeoutDisp; - class TimeoutI extends _TimeoutDisp { static class ActivateAdapterThread extends Thread diff --git a/java-compat/test/src/main/java/test/IceBox/configuration/TestI.java b/java-compat/test/src/main/java/test/IceBox/configuration/TestI.java index c969859be45..bf5422e6c63 100644 --- a/java-compat/test/src/main/java/test/IceBox/configuration/TestI.java +++ b/java-compat/test/src/main/java/test/IceBox/configuration/TestI.java @@ -11,7 +11,6 @@ package test.IceBox.configuration; import test.IceBox.configuration.Test._TestIntfDisp; - public class TestI extends _TestIntfDisp { public diff --git a/java-compat/test/src/main/java/test/IceBox/configuration/config.service1-2 b/java-compat/test/src/main/java/test/IceBox/configuration/config.service1-2 index 835acbadfc9..e7f07a370f2 100644 --- a/java-compat/test/src/main/java/test/IceBox/configuration/config.service1-2 +++ b/java-compat/test/src/main/java/test/IceBox/configuration/config.service1-2 @@ -7,5 +7,4 @@ Service1.ArgProp=1 OverrideMe=2 UnsetMe= - Ice.PrintAdapterReady=0 diff --git a/java-compat/test/src/main/java/test/IceDiscovery/simple/Test.ice b/java-compat/test/src/main/java/test/IceDiscovery/simple/Test.ice index bcb14d687e7..14134f6b56d 100644 --- a/java-compat/test/src/main/java/test/IceDiscovery/simple/Test.ice +++ b/java-compat/test/src/main/java/test/IceDiscovery/simple/Test.ice @@ -9,7 +9,6 @@ #pragma once - [["java:package:test.IceDiscovery.simple"]] module Test { diff --git a/java-compat/test/src/main/java/test/IceSSL/configuration/Server.java b/java-compat/test/src/main/java/test/IceSSL/configuration/Server.java index 1b023330d04..dd5d26e9413 100644 --- a/java-compat/test/src/main/java/test/IceSSL/configuration/Server.java +++ b/java-compat/test/src/main/java/test/IceSSL/configuration/Server.java @@ -9,7 +9,6 @@ package test.IceSSL.configuration; - public class Server extends test.Util.Application { @Override diff --git a/java/gradle/ice.gradle b/java/gradle/ice.gradle index b25edccce85..62db546d599 100644 --- a/java/gradle/ice.gradle +++ b/java/gradle/ice.gradle @@ -100,7 +100,6 @@ if ((prefix.startsWith("/usr") || prefix.startsWith("/usr/local")) && !prefix.st def iceCppDir = slice.srcDist ? [slice.iceHome, "cpp"].join(File.separator) : slice.iceHome def iceSrcDist = false - // Check is DESTDIR is set (non-Windows) if (isWindows) { ext.DESTDIR = "" diff --git a/java/src/Glacier2/src/main/java/com/zeroc/Glacier2/Application.java b/java/src/Glacier2/src/main/java/com/zeroc/Glacier2/Application.java index 464f0ca7e01..09e0de80884 100644 --- a/java/src/Glacier2/src/main/java/com/zeroc/Glacier2/Application.java +++ b/java/src/Glacier2/src/main/java/com/zeroc/Glacier2/Application.java @@ -107,7 +107,6 @@ public abstract class Application extends com.zeroc.Ice.Application public abstract int runWithSession(String[] args) throws RestartSessionException; - /** * Called when the session refresh thread detects that the session has been * destroyed. A subclass can override this method to take action after the diff --git a/java/src/Ice/src/main/java/com/zeroc/Ice/LoggerI.java b/java/src/Ice/src/main/java/com/zeroc/Ice/LoggerI.java index 62de4757b52..a8cb8af9ca9 100644 --- a/java/src/Ice/src/main/java/com/zeroc/Ice/LoggerI.java +++ b/java/src/Ice/src/main/java/com/zeroc/Ice/LoggerI.java @@ -108,7 +108,6 @@ public class LoggerI implements Logger write(s, true); } - @Override public String getPrefix() diff --git a/java/src/Ice/src/main/java/com/zeroc/Ice/ObjectAdapterI.java b/java/src/Ice/src/main/java/com/zeroc/Ice/ObjectAdapterI.java index 3b9dfd5343f..d7ff266e1ba 100644 --- a/java/src/Ice/src/main/java/com/zeroc/Ice/ObjectAdapterI.java +++ b/java/src/Ice/src/main/java/com/zeroc/Ice/ObjectAdapterI.java @@ -161,7 +161,6 @@ public final class ObjectAdapterI implements ObjectAdapter } } - @Override public void deactivate() diff --git a/java/src/Ice/src/main/java/com/zeroc/Ice/SysLoggerI.java b/java/src/Ice/src/main/java/com/zeroc/Ice/SysLoggerI.java index 13a905c7a49..2ba7b74c17c 100644 --- a/java/src/Ice/src/main/java/com/zeroc/Ice/SysLoggerI.java +++ b/java/src/Ice/src/main/java/com/zeroc/Ice/SysLoggerI.java @@ -163,7 +163,6 @@ public final class SysLoggerI implements Logger log(LOG_ERR, message); } - @Override public String getPrefix() diff --git a/java/src/Ice/src/main/java/com/zeroc/IceInternal/FactoryACMMonitor.java b/java/src/Ice/src/main/java/com/zeroc/IceInternal/FactoryACMMonitor.java index f6c1bfd1780..d952e567fea 100644 --- a/java/src/Ice/src/main/java/com/zeroc/IceInternal/FactoryACMMonitor.java +++ b/java/src/Ice/src/main/java/com/zeroc/IceInternal/FactoryACMMonitor.java @@ -189,7 +189,6 @@ class FactoryACMMonitor implements ACMMonitor } } - // // Monitor connections outside the thread synchronization, so // that connections can be added or removed during monitoring. diff --git a/java/src/Ice/src/main/java/com/zeroc/IceInternal/LoggerAdminI.java b/java/src/Ice/src/main/java/com/zeroc/IceInternal/LoggerAdminI.java index ce022cfa077..e9defaf1a1e 100644 --- a/java/src/Ice/src/main/java/com/zeroc/IceInternal/LoggerAdminI.java +++ b/java/src/Ice/src/main/java/com/zeroc/IceInternal/LoggerAdminI.java @@ -428,7 +428,6 @@ final class LoggerAdminI implements com.zeroc.Ice.LoggerAdmin return com.zeroc.Ice.Util.initialize(initData); } - private final java.util.List<LogMessage> _queue = new java.util.LinkedList<>(); private int _logCount = 0; // non-trace messages private final int _maxLogCount; diff --git a/java/src/Ice/src/main/java/com/zeroc/IceInternal/ObjectAdapterFactory.java b/java/src/Ice/src/main/java/com/zeroc/IceInternal/ObjectAdapterFactory.java index a9dd79f9dbb..a012ddee995 100644 --- a/java/src/Ice/src/main/java/com/zeroc/IceInternal/ObjectAdapterFactory.java +++ b/java/src/Ice/src/main/java/com/zeroc/IceInternal/ObjectAdapterFactory.java @@ -49,7 +49,6 @@ public final class ObjectAdapterFactory } } - public void waitForShutdown() { diff --git a/java/src/Ice/src/main/java/com/zeroc/IceInternal/PropertyNames.java b/java/src/Ice/src/main/java/com/zeroc/IceInternal/PropertyNames.java index 0747c9632ab..ee67ab7c1f0 100644 --- a/java/src/Ice/src/main/java/com/zeroc/IceInternal/PropertyNames.java +++ b/java/src/Ice/src/main/java/com/zeroc/IceInternal/PropertyNames.java @@ -1296,7 +1296,6 @@ public final class PropertyNames null }; - public static final Property[] validProps[] = { IceProps, diff --git a/java/src/Ice/src/main/java/com/zeroc/IceUtilInternal/Options.java b/java/src/Ice/src/main/java/com/zeroc/IceUtilInternal/Options.java index a8858b6e453..f3887f4aa68 100644 --- a/java/src/Ice/src/main/java/com/zeroc/IceUtilInternal/Options.java +++ b/java/src/Ice/src/main/java/com/zeroc/IceUtilInternal/Options.java @@ -401,5 +401,4 @@ public final class Options return vec.toArray(new String[0]); } - } diff --git a/java/src/IceBox/src/main/java/com/zeroc/IceBox/ServiceManagerI.java b/java/src/IceBox/src/main/java/com/zeroc/IceBox/ServiceManagerI.java index 703a0de30ac..e42e5778970 100644 --- a/java/src/IceBox/src/main/java/com/zeroc/IceBox/ServiceManagerI.java +++ b/java/src/IceBox/src/main/java/com/zeroc/IceBox/ServiceManagerI.java @@ -1151,7 +1151,6 @@ public class ServiceManagerI implements ServiceManager } } - private com.zeroc.Ice.Communicator _communicator; private boolean _adminEnabled = false; private java.util.Set<String> _adminFacetFilter; diff --git a/java/src/IceDiscovery/src/main/java/com/zeroc/IceDiscovery/LookupI.java b/java/src/IceDiscovery/src/main/java/com/zeroc/IceDiscovery/LookupI.java index 0de78d3215b..f223bfd87b4 100644 --- a/java/src/IceDiscovery/src/main/java/com/zeroc/IceDiscovery/LookupI.java +++ b/java/src/IceDiscovery/src/main/java/com/zeroc/IceDiscovery/LookupI.java @@ -423,7 +423,6 @@ class LookupI implements Lookup _objectRequests.remove(request.getId()); } - synchronized void objectRequestException(ObjectRequest request, Throwable ex) { ObjectRequest r = _objectRequests.get(request.getId()); diff --git a/java/src/IceGridGUI/javafx.gradle b/java/src/IceGridGUI/javafx.gradle index 02ff58f7685..51d0e29f4dc 100644 --- a/java/src/IceGridGUI/javafx.gradle +++ b/java/src/IceGridGUI/javafx.gradle @@ -45,7 +45,6 @@ jar { ant, 'javafx:com.sun.javafx.tools.ant') - ant.taskdef( resource: 'com/sun/javafx/tools/ant/antlib.xml', uri: 'javafx:com.sun.javafx.tools.ant', diff --git a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/PropertySet.java b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/PropertySet.java index 83a17458385..cf21ba56c8a 100644 --- a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/PropertySet.java +++ b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/PropertySet.java @@ -203,7 +203,6 @@ class PropertySet extends TreeNode rebuild(descriptor); } - PropertySet(TreeNode parent, String id, PropertySetDescriptor descriptor) { super(parent, id); diff --git a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/Root.java b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/Root.java index 94567611517..c8dcd0f72d8 100644 --- a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/Root.java +++ b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/Root.java @@ -42,7 +42,6 @@ public class Root extends ListTreeNode _file = file; _live = live; - init(); } diff --git a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ServerSubEditor.java b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ServerSubEditor.java index 557380f5514..ef3d91d253d 100644 --- a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ServerSubEditor.java +++ b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ServerSubEditor.java @@ -96,7 +96,6 @@ class ServerSubEditor extends CommunicatorSubEditor + "of this server can only be allocated by one session at a time.</html>"); _allocatable = new JCheckBox(allocatable); - Action appDistrib = new AbstractAction("Depends on the application distribution") { @Override diff --git a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/ApplicationActions.java b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/ApplicationActions.java index eed4a719183..0e31b5a25d3 100644 --- a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/ApplicationActions.java +++ b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/ApplicationActions.java @@ -145,7 +145,6 @@ public class ApplicationActions } }; - _array[TreeNode.NEW_SERVICE] = new AbstractAction(popup ? "New Service" : "Service") { @Override @@ -196,7 +195,6 @@ public class ApplicationActions } }; - _array[TreeNode.NEW_TEMPLATE_SERVICE] = new AbstractAction(popup ? "New Service Template" : "Service Template") { @Override diff --git a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Coordinator.java b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Coordinator.java index e5b95df54e0..a2af720198b 100644 --- a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Coordinator.java +++ b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Coordinator.java @@ -2842,7 +2842,6 @@ public class Coordinator _saveToRegistry.setEnabled(false); _saveToRegistry.putValue(Action.SHORT_DESCRIPTION, "Save to registry (servers may restart)"); - _saveToRegistryWithoutRestart = new AbstractAction("Save to Registry (No server restart)") { @Override diff --git a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveActions.java b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveActions.java index 4c11c6fd4b8..9485198a63c 100644 --- a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveActions.java +++ b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveActions.java @@ -85,7 +85,6 @@ public class LiveActions }; _array[TreeNode.STOP].putValue(Action.SHORT_DESCRIPTION, "Stop this server or service"); - _array[TreeNode.ENABLE] = new AbstractAction("Enable", Utils.getIcon("/icons/16x16/enable.png")) { @Override @@ -124,7 +123,6 @@ public class LiveActions }; _array[TreeNode.WRITE_MESSAGE].putValue(Action.SHORT_DESCRIPTION, "Write message to stdout or stderr"); - _array[TreeNode.RETRIEVE_ICE_LOG] = new AbstractAction("Retrieve Ice log") { @Override @@ -135,7 +133,6 @@ public class LiveActions }; _array[TreeNode.RETRIEVE_ICE_LOG].putValue(Action.SHORT_DESCRIPTION, "Attach RemoteLogger to Ice logger"); - _array[TreeNode.RETRIEVE_STDOUT] = new AbstractAction("Retrieve stdout") { @Override diff --git a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/Communicator.java b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/Communicator.java index 1230d77dcb6..cfd2c686c69 100644 --- a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/Communicator.java +++ b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/Communicator.java @@ -145,7 +145,6 @@ abstract public class Communicator extends TreeNode return true; } - // // TreeNode overrides // @@ -296,7 +295,6 @@ abstract public class Communicator extends TreeNode } protected abstract String getDefaultFileName(); - private boolean provideAdmin(final String prefix, final java.util.function.Consumer<com.zeroc.Ice.ObjectPrx> consumer) { getRoot().getCoordinator().getStatusBar().setText(prefix); diff --git a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/CommunicatorEditor.java b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/CommunicatorEditor.java index 87d28223f31..c45d2a1f287 100644 --- a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/CommunicatorEditor.java +++ b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/CommunicatorEditor.java @@ -80,7 +80,6 @@ class CommunicatorEditor extends Editor _refreshButton.setEnabled(true); } - void setRuntimeProperties(java.util.SortedMap<String, String> map, Communicator communicator) { if(communicator == _target) diff --git a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/GraphView.java b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/GraphView.java index a9fdb990489..0b695187ef3 100644 --- a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/GraphView.java +++ b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/GraphView.java @@ -1695,7 +1695,6 @@ public class GraphView extends JFrame implements MetricsFieldContext, Coordinato "Metrics Name", "Metrics Id", "Metrics Field", "Scale", "Last", "Average", "Minimum", "Maximum", "Color"}; - // // The metrics view being graph // diff --git a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/Node.java b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/Node.java index 417c4ed554e..78330548850 100755 --- a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/Node.java +++ b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/Node.java @@ -209,7 +209,6 @@ class Node extends Communicator return _cellRenderer.getTreeCellRendererComponent(tree, value, sel, expanded, leaf, row, hasFocus); } - // // Implement Communicator abstract methods // diff --git a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/RegistryEditor.java b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/RegistryEditor.java index e0195f53cb7..2d2370ac26e 100644 --- a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/RegistryEditor.java +++ b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/RegistryEditor.java @@ -159,7 +159,6 @@ class RegistryEditor extends CommunicatorEditor } }); - Action deleteObject = new AbstractAction("Remove selected object") { @Override diff --git a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/Server.java b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/Server.java index 7b6891daf07..dcfadc2b53c 100755 --- a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/Server.java +++ b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/Server.java @@ -1001,7 +1001,6 @@ public class Server extends Communicator serverInstancePSDescriptor)); } - // // Implement Communicator abstract methods // diff --git a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/Service.java b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/Service.java index c6a4b29e0a3..8ae6388eb2c 100755 --- a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/Service.java +++ b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/Service.java @@ -239,7 +239,6 @@ public class Service extends Communicator return _popup; } - // // Implement Communicator abstract methods // diff --git a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/ShowIceLogDialog.java b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/ShowIceLogDialog.java index adad4109f50..3f4b6ace903 100755 --- a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/ShowIceLogDialog.java +++ b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/ShowIceLogDialog.java @@ -650,7 +650,6 @@ class ShowIceLogDialog extends JDialog _remoteLoggerPrx = RemoteLoggerPrx.uncheckedCast( _parent.getRoot().getCoordinator().addCallback(_remoteLogger, id, "")); - final String prefix = "Attaching remote logger to " + _loggerAdmin.ice_getIdentity().name + "..."; final String errorTitle = "Failed to attach remote logger to " + _loggerAdmin.ice_getIdentity().name; _parent.getRoot().getCoordinator().getStatusBar().setText(prefix); diff --git a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/SessionKeeper.java b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/SessionKeeper.java index f077179d86c..2e8387868d0 100644 --- a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/SessionKeeper.java +++ b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/SessionKeeper.java @@ -1028,7 +1028,6 @@ public class SessionKeeper private boolean _isDefault; } - // // FocusListener implementation that unselect the text // of a text component after focus gained. @@ -1234,7 +1233,6 @@ public class SessionKeeper } }); - _directDiscoveryLocatorList.addListSelectionListener(new ListSelectionListener() { @Override @@ -4742,7 +4740,6 @@ public class SessionKeeper Container contentPane = getContentPane(); contentPane.setLayout(new BoxLayout(contentPane, BoxLayout.Y_AXIS)); - FormLayout layout = new FormLayout("pref:grow", ""); DefaultFormBuilder builder = new DefaultFormBuilder(layout); builder.border(Borders.DIALOG); diff --git a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/SimpleInternalFrame.java b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/SimpleInternalFrame.java index 860e203da78..e2bf584edef 100644 --- a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/SimpleInternalFrame.java +++ b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/SimpleInternalFrame.java @@ -70,7 +70,6 @@ public class SimpleInternalFrame extends JPanel { private JPanel headerPanel; private boolean selected; - // Instance Creation **************************************************** /** @@ -84,7 +83,6 @@ public class SimpleInternalFrame extends JPanel { this(null, title, null, null); } - /** * Constructs a SimpleInternalFrame with the specified * icon, and title. @@ -96,7 +94,6 @@ public class SimpleInternalFrame extends JPanel { this(icon, title, null, null); } - /** * Constructs a SimpleInternalFrame with the specified * title, tool bar, and content panel. @@ -109,7 +106,6 @@ public class SimpleInternalFrame extends JPanel { this(null, title, bar, content); } - /** * Constructs a SimpleInternalFrame with the specified * icon, title, tool bar, and content panel. @@ -138,7 +134,6 @@ public class SimpleInternalFrame extends JPanel { updateHeader(); } - // Public API *********************************************************** /** @@ -150,7 +145,6 @@ public class SimpleInternalFrame extends JPanel { return titleLabel.getIcon(); } - /** * Sets a new frame icon. * @@ -162,7 +156,6 @@ public class SimpleInternalFrame extends JPanel { firePropertyChange("frameIcon", oldIcon, newIcon); } - /** * Returns the frame's title text. * * @return String the current title text */ @@ -174,8 +167,6 @@ public class SimpleInternalFrame extends JPanel { return titleLabel; } - - /** * Sets a new title text. * * @param newText the title text tp be set */ @@ -185,7 +176,6 @@ public class SimpleInternalFrame extends JPanel { firePropertyChange("title", oldText, newText); } - /** * Returns the current toolbar, null if none has been set before. * @@ -197,7 +187,6 @@ public class SimpleInternalFrame extends JPanel { : null; } - /** * Sets a new tool bar in the header. * @@ -219,7 +208,6 @@ public class SimpleInternalFrame extends JPanel { firePropertyChange("toolBar", oldToolBar, newToolBar); } - /** * Returns the content - null, if none has been set. * * @return the current content */ @@ -227,7 +215,6 @@ public class SimpleInternalFrame extends JPanel { return hasContent() ? getComponent(1) : null; } - /** * Sets a new panel content; replaces any existing content, if existing. * * @param newContent the panel's new content */ @@ -240,7 +227,6 @@ public class SimpleInternalFrame extends JPanel { firePropertyChange("content", oldContent, newContent); } - /** * Answers if the panel is currently selected (or in other words active) * or not. In the selected state, the header background will be @@ -253,7 +239,6 @@ public class SimpleInternalFrame extends JPanel { return selected; } - /** * This panel draws its title bar differently if it is selected, * which may be used to indicate to the user that this panel @@ -270,7 +255,6 @@ public class SimpleInternalFrame extends JPanel { firePropertyChange("selected", oldValue, newValue); } - // Building ************************************************************* /** @@ -314,7 +298,6 @@ public class SimpleInternalFrame extends JPanel { headerPanel.repaint(); } - /** * Updates the UI. In addition to the superclass behavior, we need * to update the header component. @@ -327,7 +310,6 @@ public class SimpleInternalFrame extends JPanel { } } - // Helper Code ********************************************************** /** @@ -381,7 +363,6 @@ public class SimpleInternalFrame extends JPanel { : UIManager.getColor("InternalFrame.activeTitleBackground"); } - // Helper Classes ******************************************************* // A custom border for the raised header pseudo 3D effect. diff --git a/java/src/IceSSL/src/main/java/com/zeroc/IceSSL/SSLEngine.java b/java/src/IceSSL/src/main/java/com/zeroc/IceSSL/SSLEngine.java index da0ba6d11d0..1482811dc62 100644 --- a/java/src/IceSSL/src/main/java/com/zeroc/IceSSL/SSLEngine.java +++ b/java/src/IceSSL/src/main/java/com/zeroc/IceSSL/SSLEngine.java @@ -842,7 +842,6 @@ class SSLEngine } } - if(incoming) { if(_verifyPeer == 0) diff --git a/java/test/src/main/java/test/Glacier2/sessionHelper/Client.java b/java/test/src/main/java/test/Glacier2/sessionHelper/Client.java index 9eee3828e11..23e5f77a76f 100644 --- a/java/test/src/main/java/test/Glacier2/sessionHelper/Client.java +++ b/java/test/src/main/java/test/Glacier2/sessionHelper/Client.java @@ -403,7 +403,6 @@ public class Client extends test.Util.Application } out.println("ok"); - out.print("uninstalling router with communicator... "); out.flush(); communicator().setDefaultRouter(null); diff --git a/java/test/src/main/java/test/Ice/faultTolerance/Client.java b/java/test/src/main/java/test/Ice/faultTolerance/Client.java index 9e1a75514ce..8b773e57da9 100644 --- a/java/test/src/main/java/test/Ice/faultTolerance/Client.java +++ b/java/test/src/main/java/test/Ice/faultTolerance/Client.java @@ -11,7 +11,6 @@ package test.Ice.faultTolerance; import java.io.PrintWriter; - public class Client extends test.Util.Application { private static void diff --git a/java/test/src/main/java/test/Ice/hash/Test.ice b/java/test/src/main/java/test/Ice/hash/Test.ice index 27a1303c1c0..f49574e6282 100644 --- a/java/test/src/main/java/test/Ice/hash/Test.ice +++ b/java/test/src/main/java/test/Ice/hash/Test.ice @@ -47,7 +47,6 @@ struct Color int a; } - dictionary<int, Color> StringColorMap; struct ColorPalette diff --git a/java/test/src/main/java/test/Ice/hold/HoldI.java b/java/test/src/main/java/test/Ice/hold/HoldI.java index 046710116bc..f183d6a4b0f 100644 --- a/java/test/src/main/java/test/Ice/hold/HoldI.java +++ b/java/test/src/main/java/test/Ice/hold/HoldI.java @@ -87,7 +87,6 @@ public final class HoldI implements Hold }, 0); } - @Override public int set(int value, int delay, com.zeroc.Ice.Current current) { diff --git a/java/test/src/main/java/test/Ice/impl/Test.ice b/java/test/src/main/java/test/Ice/impl/Test.ice index dfd37af7a80..a55a3b190e5 100644 --- a/java/test/src/main/java/test/Ice/impl/Test.ice +++ b/java/test/src/main/java/test/Ice/impl/Test.ice @@ -144,7 +144,6 @@ interface MyClass LongSS opShortIntLongSS(ShortSS p1, IntSS p2, LongSS p3, out ShortSS p4, out IntSS p5, out LongSS p6); - DoubleSS opFloatDoubleSS(FloatSS p1, DoubleSS p2, out FloatSS p3, out DoubleSS p4); diff --git a/java/test/src/main/java/test/Ice/impl/TestAMD.ice b/java/test/src/main/java/test/Ice/impl/TestAMD.ice index eb2fb75565b..b44a4c10100 100644 --- a/java/test/src/main/java/test/Ice/impl/TestAMD.ice +++ b/java/test/src/main/java/test/Ice/impl/TestAMD.ice @@ -144,7 +144,6 @@ dictionary<MyEnum, MyEnumS> MyEnumMyEnumSD; LongSS opShortIntLongSS(ShortSS p1, IntSS p2, LongSS p3, out ShortSS p4, out IntSS p5, out LongSS p6); - DoubleSS opFloatDoubleSS(FloatSS p1, DoubleSS p2, out FloatSS p3, out DoubleSS p4); diff --git a/java/test/src/main/java/test/Ice/interceptor/Test.ice b/java/test/src/main/java/test/Ice/interceptor/Test.ice index b422c705821..9735260193a 100644 --- a/java/test/src/main/java/test/Ice/interceptor/Test.ice +++ b/java/test/src/main/java/test/Ice/interceptor/Test.ice @@ -80,5 +80,4 @@ interface MyObject } - } diff --git a/java/test/src/main/java/test/Ice/interrupt/TestI.java b/java/test/src/main/java/test/Ice/interrupt/TestI.java index d9fd8d161de..1c8bf5014e7 100644 --- a/java/test/src/main/java/test/Ice/interrupt/TestI.java +++ b/java/test/src/main/java/test/Ice/interrupt/TestI.java @@ -27,7 +27,6 @@ public class TestI implements test.Ice.interrupt.Test.TestIntf throw new com.zeroc.Ice.UnknownException(); } - @Override public void sleep(int to, com.zeroc.Ice.Current current) throws test.Ice.interrupt.Test.InterruptedException diff --git a/java/test/src/main/java/test/Ice/operations/Test.ice b/java/test/src/main/java/test/Ice/operations/Test.ice index d212ed07278..a0f397831cc 100644 --- a/java/test/src/main/java/test/Ice/operations/Test.ice +++ b/java/test/src/main/java/test/Ice/operations/Test.ice @@ -144,7 +144,6 @@ interface MyClass LongSS opShortIntLongSS(ShortSS p1, IntSS p2, LongSS p3, out ShortSS p4, out IntSS p5, out LongSS p6); - DoubleSS opFloatDoubleSS(FloatSS p1, DoubleSS p2, out FloatSS p3, out DoubleSS p4); diff --git a/java/test/src/main/java/test/Ice/operations/TestAMD.ice b/java/test/src/main/java/test/Ice/operations/TestAMD.ice index 152b4ed1b7e..5cfb4e9ee7c 100644 --- a/java/test/src/main/java/test/Ice/operations/TestAMD.ice +++ b/java/test/src/main/java/test/Ice/operations/TestAMD.ice @@ -144,7 +144,6 @@ dictionary<MyEnum, MyEnumS> MyEnumMyEnumSD; LongSS opShortIntLongSS(ShortSS p1, IntSS p2, LongSS p3, out ShortSS p4, out IntSS p5, out LongSS p6); - DoubleSS opFloatDoubleSS(FloatSS p1, DoubleSS p2, out FloatSS p3, out DoubleSS p4); diff --git a/java/test/src/main/java/test/Ice/properties/config/escapes.cfg b/java/test/src/main/java/test/Ice/properties/config/escapes.cfg index bd7c16643d9..a9d91a0a19f 100644 --- a/java/test/src/main/java/test/Ice/properties/config/escapes.cfg +++ b/java/test/src/main/java/test/Ice/properties/config/escapes.cfg @@ -22,7 +22,6 @@ foo\=bar=1 # Name is "foo=bar", value is "1" foo\#bar = 2 # Name is "foo#bar", value is "2" foo bar =3 # Name is "foo bar", value is "3" - A=1 # Name is "A", value is "1" B= 2 3 4 # Name is "B", value is "2 3 4" C=5=\#6 # 7 # Name is "C", value is "5=#6" diff --git a/java/test/src/main/java/test/Ice/stream/Client.java b/java/test/src/main/java/test/Ice/stream/Client.java index 82c880f536d..7ee145b61a8 100644 --- a/java/test/src/main/java/test/Ice/stream/Client.java +++ b/java/test/src/main/java/test/Ice/stream/Client.java @@ -740,7 +740,6 @@ public class Client extends test.Util.Application test(dict2.equals(dict)); } - { java.util.Map<Long, Float> dict = new java.util.HashMap<>(); dict.put((long)123809828, 0.51f); diff --git a/java/test/src/main/java/test/IceBox/configuration/config.service1-2 b/java/test/src/main/java/test/IceBox/configuration/config.service1-2 index 835acbadfc9..e7f07a370f2 100644 --- a/java/test/src/main/java/test/IceBox/configuration/config.service1-2 +++ b/java/test/src/main/java/test/IceBox/configuration/config.service1-2 @@ -7,5 +7,4 @@ Service1.ArgProp=1 OverrideMe=2 UnsetMe= - Ice.PrintAdapterReady=0 diff --git a/java/test/src/main/java/test/IceDiscovery/simple/Test.ice b/java/test/src/main/java/test/IceDiscovery/simple/Test.ice index bcb14d687e7..14134f6b56d 100644 --- a/java/test/src/main/java/test/IceDiscovery/simple/Test.ice +++ b/java/test/src/main/java/test/IceDiscovery/simple/Test.ice @@ -9,7 +9,6 @@ #pragma once - [["java:package:test.IceDiscovery.simple"]] module Test { diff --git a/js/gulp/bundle.js b/js/gulp/bundle.js index d4815677218..b592f8cd068 100644 --- a/js/gulp/bundle.js +++ b/js/gulp/bundle.js @@ -318,7 +318,6 @@ function bundle(args) var moduleEpilogue = " }());\n"; - var sb = new StringBuffer(); sb.write(preamble); diff --git a/js/gulpfile.js b/js/gulpfile.js index 2ddc4de9dcd..3adb059be09 100644 --- a/js/gulpfile.js +++ b/js/gulpfile.js @@ -503,7 +503,6 @@ gulp.task("lint:js", ["build"], jshint.reporter("default")], cb); }); - var buildDepends = ["dist", "test"]; var cleanDepends = ["test:clean", "common:clean"]; diff --git a/js/src/Ice/Address.js b/js/src/Ice/Address.js index 26d24658c09..ed9cc9e3b7c 100644 --- a/js/src/Ice/Address.js +++ b/js/src/Ice/Address.js @@ -7,7 +7,6 @@ // // ********************************************************************** - const Ice = require("../Ice/ModuleRegistry").Ice; class Address diff --git a/js/src/Ice/DefaultsAndOverrides.js b/js/src/Ice/DefaultsAndOverrides.js index 51b1f9a084f..26c10ad2cd4 100644 --- a/js/src/Ice/DefaultsAndOverrides.js +++ b/js/src/Ice/DefaultsAndOverrides.js @@ -7,7 +7,6 @@ // // ********************************************************************** - const Ice = require("../Ice/ModuleRegistry").Ice; Ice._ModuleRegistry.require(module, [ diff --git a/js/src/Ice/EnumBase.js b/js/src/Ice/EnumBase.js index 28e21b2ccc6..dc18069e96b 100644 --- a/js/src/Ice/EnumBase.js +++ b/js/src/Ice/EnumBase.js @@ -7,7 +7,6 @@ // // ********************************************************************** - const Ice = require("../Ice/ModuleRegistry").Ice; // // Ice.EnumBase diff --git a/js/src/Ice/Ice.js b/js/src/Ice/Ice.js index 56057f11bbd..f109a18c78f 100644 --- a/js/src/Ice/Ice.js +++ b/js/src/Ice/Ice.js @@ -7,7 +7,6 @@ // // ********************************************************************** - const _ModuleRegistry = require("../Ice/ModuleRegistry").Ice._ModuleRegistry; module.exports.Ice = _ModuleRegistry.require(module, diff --git a/js/src/Ice/Instance.js b/js/src/Ice/Instance.js index 7e3ca7e704b..8d2f0cbd0a3 100644 --- a/js/src/Ice/Instance.js +++ b/js/src/Ice/Instance.js @@ -355,7 +355,6 @@ class Instance new ACMConfig(this._initData.properties, this._initData.logger, "Ice.ACM", new ACMConfig())); - const toStringModeStr = this._initData.properties.getPropertyWithDefault("Ice.ToStringMode", "Unicode"); if(toStringModeStr === "ASCII") { diff --git a/js/src/Ice/Operation.js b/js/src/Ice/Operation.js index 399eab97377..6e58457370e 100644 --- a/js/src/Ice/Operation.js +++ b/js/src/Ice/Operation.js @@ -7,7 +7,6 @@ // // ********************************************************************** - const Ice = require("../Ice/ModuleRegistry").Ice; const _ModuleRegistry = Ice._ModuleRegistry; _ModuleRegistry.require(module, diff --git a/js/src/Ice/Properties.js b/js/src/Ice/Properties.js index a42e7a8c525..5375c7ad0f3 100644 --- a/js/src/Ice/Properties.js +++ b/js/src/Ice/Properties.js @@ -7,7 +7,6 @@ // // ********************************************************************** - const Ice = require("../Ice/ModuleRegistry").Ice; Ice._ModuleRegistry.require(module, [ diff --git a/js/src/Ice/RouterInfo.js b/js/src/Ice/RouterInfo.js index 8e9a5875587..e03a7cad8a5 100644 --- a/js/src/Ice/RouterInfo.js +++ b/js/src/Ice/RouterInfo.js @@ -91,7 +91,6 @@ class RouterInfo return promise; } - getServerEndpoints() { if(this._serverEndpoints !== null) // Lazy initialization. diff --git a/js/src/Ice/Stream.js b/js/src/Ice/Stream.js index 8ac72046c6e..ba859ee9eb3 100644 --- a/js/src/Ice/Stream.js +++ b/js/src/Ice/Stream.js @@ -2686,7 +2686,6 @@ class EncapsEncoder11 extends EncapsEncoder this._current.indirectionMap = new Map(); // Map<Ice.Value, int> } - info.instances.forEach(instance => this._current.indirectionTable.push(instance)); } diff --git a/js/src/Ice/StreamHelpers.js b/js/src/Ice/StreamHelpers.js index c5136903016..1b66c7f4db4 100644 --- a/js/src/Ice/StreamHelpers.js +++ b/js/src/Ice/StreamHelpers.js @@ -152,8 +152,6 @@ class SequenceHelper } } - - // Speacialization optimized for ByteSeq const byteSeqHelper = new SequenceHelper(); byteSeqHelper.write = function(os, v) { return os.writeByteSeq(v); }; diff --git a/js/src/Ice/StringUtil.js b/js/src/Ice/StringUtil.js index 875a8be63ca..8c3f9ce3e65 100644 --- a/js/src/Ice/StringUtil.js +++ b/js/src/Ice/StringUtil.js @@ -268,7 +268,6 @@ Ice.StringUtil = class }; module.exports.Ice = Ice; - function encodeChar(c, sb, special, toStringMode) { switch(c) diff --git a/js/src/Ice/TcpTransceiver.js b/js/src/Ice/TcpTransceiver.js index 96546c27472..f190e117200 100644 --- a/js/src/Ice/TcpTransceiver.js +++ b/js/src/Ice/TcpTransceiver.js @@ -440,7 +440,6 @@ function addressesToString(localHost, localPort, remoteHost, remotePort, targetA return s.join(""); } - const ECONNABORTED = "ECONNABORTED"; const ECONNREFUSED = "ECONNREFUSED"; const ECONNRESET = "ECONNRESET"; diff --git a/js/src/Ice/browser/TimerUtil.js b/js/src/Ice/browser/TimerUtil.js index 3acbb4606ac..38795525903 100644 --- a/js/src/Ice/browser/TimerUtil.js +++ b/js/src/Ice/browser/TimerUtil.js @@ -13,7 +13,6 @@ /* global WorkerGlobalScope */ - const Ice = require("../Ice/ModuleRegistry").Ice; // diff --git a/js/test/Common/TestRunner.js b/js/test/Common/TestRunner.js index 8d6903b0fff..b3259bfa7c8 100644 --- a/js/test/Common/TestRunner.js +++ b/js/test/Common/TestRunner.js @@ -7,7 +7,6 @@ // // ********************************************************************** - /* global _test : false, _runServer : false, diff --git a/js/test/Common/Worker.js b/js/test/Common/Worker.js index 19e42a099f4..573e2e25451 100644 --- a/js/test/Common/Worker.js +++ b/js/test/Common/Worker.js @@ -56,7 +56,6 @@ self.onmessage = function(e) self.importScripts(f); } - runTest(test.name, test.language, test.defaultHost, test.protocol, test.testcases, Output).then( function(r) { diff --git a/js/test/Glacier2/router/Client.js b/js/test/Glacier2/router/Client.js index 0c8496d7782..5dde0d2720b 100644 --- a/js/test/Glacier2/router/Client.js +++ b/js/test/Glacier2/router/Client.js @@ -33,7 +33,6 @@ this._p = new Ice.Promise(); } - callback(current) { test(!this._callback); diff --git a/js/test/Ice/defaultValue/Client.js b/js/test/Ice/defaultValue/Client.js index f176d558ca3..41aa9b6b44d 100644 --- a/js/test/Ice/defaultValue/Client.js +++ b/js/test/Ice/defaultValue/Client.js @@ -161,7 +161,6 @@ out.writeLine("ok"); - out.write("testing default constructor... "); var v2 = new Test.StructNoDefaults(); diff --git a/js/test/Ice/import/Demo/Point.ice b/js/test/Ice/import/Demo/Point.ice index 17ba0af3eeb..3b305c64307 100644 --- a/js/test/Ice/import/Demo/Point.ice +++ b/js/test/Ice/import/Demo/Point.ice @@ -17,5 +17,4 @@ struct Point } - } diff --git a/js/test/Ice/import/Demo/Square.ice b/js/test/Ice/import/Demo/Square.ice index 77326b945d4..f3dbdb46662 100644 --- a/js/test/Ice/import/Demo/Square.ice +++ b/js/test/Ice/import/Demo/Square.ice @@ -19,7 +19,6 @@ struct Square Point p4; } - } } diff --git a/js/test/Ice/inheritance/Test.ice b/js/test/Ice/inheritance/Test.ice index 4e7df94a481..308d55d3ba5 100644 --- a/js/test/Ice/inheritance/Test.ice +++ b/js/test/Ice/inheritance/Test.ice @@ -82,7 +82,6 @@ interface Initial MA::IC* icop(); } - module MC { diff --git a/js/test/Ice/number/Client.js b/js/test/Ice/number/Client.js index 12667f3908e..9de26895452 100644 --- a/js/test/Ice/number/Client.js +++ b/js/test/Ice/number/Client.js @@ -76,8 +76,6 @@ test(new Ice.Long(-Math.pow(2, 52)).toNumber() === -Math.pow(2, 52)); // -(2^52) test(new Ice.Long(-Math.pow(2, 52) - 1).toNumber() === -Math.pow(2, 52) - 1); // -(2^52 - 1) - - out.writeLine("ok"); }); }; diff --git a/js/test/Ice/objects/Test.ice b/js/test/Ice/objects/Test.ice index d7e55ca15de..fd0b5e11b09 100644 --- a/js/test/Ice/objects/Test.ice +++ b/js/test/Ice/objects/Test.ice @@ -107,7 +107,6 @@ class CompactExt(CompactExtId) extends Compact { } - class A1 { string name; diff --git a/js/test/Ice/operations/Test.ice b/js/test/Ice/operations/Test.ice index 18d7af12862..5b91f23eb1c 100644 --- a/js/test/Ice/operations/Test.ice +++ b/js/test/Ice/operations/Test.ice @@ -144,7 +144,6 @@ interface MyClass LongSS opShortIntLongSS(ShortSS p1, IntSS p2, LongSS p3, out ShortSS p4, out IntSS p5, out LongSS p6); - DoubleSS opFloatDoubleSS(FloatSS p1, DoubleSS p2, out FloatSS p3, out DoubleSS p4); diff --git a/js/test/Ice/optional/Client.js b/js/test/Ice/optional/Client.js index fea6c3a6fa2..74d068499d5 100644 --- a/js/test/Ice/optional/Client.js +++ b/js/test/Ice/optional/Client.js @@ -111,7 +111,6 @@ test(mo4.ser === undefined); - mo1 = new Test.MultiOptional(); mo1.a = 15; mo1.b = true; diff --git a/js/test/Ice/optional/ServerAMD.js b/js/test/Ice/optional/ServerAMD.js index 86779fd2d76..94424603114 100644 --- a/js/test/Ice/optional/ServerAMD.js +++ b/js/test/Ice/optional/ServerAMD.js @@ -13,7 +13,6 @@ var Test = require("Test").Test; var AMDInitialI = require("AMDInitialI").AMDInitialI; - var run = function(out, id, ready) { var communicator = Ice.initialize(id); diff --git a/js/test/Ice/properties/config/escapes.cfg b/js/test/Ice/properties/config/escapes.cfg index bd7c16643d9..a9d91a0a19f 100644 --- a/js/test/Ice/properties/config/escapes.cfg +++ b/js/test/Ice/properties/config/escapes.cfg @@ -22,7 +22,6 @@ foo\=bar=1 # Name is "foo=bar", value is "1" foo\#bar = 2 # Name is "foo#bar", value is "2" foo bar =3 # Name is "foo bar", value is "3" - A=1 # Name is "A", value is "1" B= 2 3 4 # Name is "B", value is "2 3 4" C=5=\#6 # 7 # Name is "C", value is "5=#6" diff --git a/js/test/Ice/proxy/Client.js b/js/test/Ice/proxy/Client.js index 102afbb93cf..f9113313f21 100644 --- a/js/test/Ice/proxy/Client.js +++ b/js/test/Ice/proxy/Client.js @@ -320,7 +320,6 @@ } } - // // Test for bug ICE-5543: escaped escapes in stringToIdentity // @@ -664,7 +663,6 @@ { } - out.writeLine("ok"); out.write("testing proxy comparison... "); diff --git a/man/man1/slice2cpp.1 b/man/man1/slice2cpp.1 index e7d6bcbc2e2..6309ae90431 100644 --- a/man/man1/slice2cpp.1 +++ b/man/man1/slice2cpp.1 @@ -132,7 +132,6 @@ not overwrite an existing file. .br Generate checksums for Slice definitions. - .SH SEE ALSO .BR slice2cs (1), diff --git a/man/man1/slice2cs.1 b/man/man1/slice2cs.1 index bb44e0386aa..84b1c20a173 100644 --- a/man/man1/slice2cs.1 +++ b/man/man1/slice2cs.1 @@ -111,7 +111,6 @@ overwrite an existing file. .br Generate checksums for Slice definitions. - .SH SEE ALSO .BR slice2cpp (1), diff --git a/objective-c/src/Ice/BatchRequestInterceptor.mm b/objective-c/src/Ice/BatchRequestInterceptor.mm index e64b94bcc14..916edd654a3 100644 --- a/objective-c/src/Ice/BatchRequestInterceptor.mm +++ b/objective-c/src/Ice/BatchRequestInterceptor.mm @@ -20,7 +20,6 @@ -(void) reset:(const Ice::BatchRequest*)call; @end - namespace { diff --git a/objective-c/src/Ice/ObjectAdapterI.mm b/objective-c/src/Ice/ObjectAdapterI.mm index 8af1acebce3..d3ae9a3cc46 100644 --- a/objective-c/src/Ice/ObjectAdapterI.mm +++ b/objective-c/src/Ice/ObjectAdapterI.mm @@ -861,5 +861,4 @@ typedef IceUtil::Handle<ServantLocatorWrapper> ServantLocatorWrapperPtr; } } - @end diff --git a/objective-c/src/Ice/Stream.mm b/objective-c/src/Ice/Stream.mm index 016b12a99be..26ca3fbe8ee 100644 --- a/objective-c/src/Ice/Stream.mm +++ b/objective-c/src/Ice/Stream.mm @@ -1387,7 +1387,6 @@ private: } } - -(void) skip:(ICEInt)sz { NSException* nsex = nil; @@ -1916,7 +1915,6 @@ private: } } - -(void) writeProxy:(id<ICEObjectPrx>)v { NSException* nsex = nil; diff --git a/objective-c/src/Ice/Util.h b/objective-c/src/Ice/Util.h index 7aeccb74074..dcf88c64388 100644 --- a/objective-c/src/Ice/Util.h +++ b/objective-c/src/Ice/Util.h @@ -44,7 +44,6 @@ ICEAsyncResult* beginCppCall(void (^fn)(Ice::AsyncResultPtr&, const Ice::Context ICEObjectPrx* = nil); void endCppCall(void (^fn)(const Ice::AsyncResultPtr&), ICEAsyncResult*); - NSException* toObjCException(const std::exception&); void rethrowCxxException(id, bool = false); diff --git a/objective-c/src/Ice/VersionI.mm b/objective-c/src/Ice/VersionI.mm index 7078a0746f6..ea3585ce596 100644 --- a/objective-c/src/Ice/VersionI.mm +++ b/objective-c/src/Ice/VersionI.mm @@ -69,7 +69,6 @@ ICE_API ICEEncodingVersion* ICECurrentEncoding; } @end - ICEProtocolVersion* ICEProtocol_1_0; ICEProtocolVersion* ICECurrentProtocol; ICEEncodingVersion* ICECurrentProtocolEncoding; diff --git a/objective-c/test/Ice/admin/AllTests.m b/objective-c/test/Ice/admin/AllTests.m index d9c8052a5cb..ec0235adeac 100644 --- a/objective-c/test/Ice/admin/AllTests.m +++ b/objective-c/test/Ice/admin/AllTests.m @@ -55,7 +55,6 @@ testFacets(id<ICECommunicator> com, BOOL builtInFacets) test([facetMap objectForKey:@"Facet2"] != nil); test([facetMap objectForKey:@"Facet3"] != nil); - @try { [com addAdminFacet:f1 facet:@"Facet1"]; @@ -411,7 +410,6 @@ adminAllTests(id<ICECommunicator> communicator) [com trace:@"testCat" message:@"trace2"]; [com warning:@"warning2"]; - ICELogMessageTypeSeq* messageTypes; ICELogMessageType messageTypesArray1[] = { ICEErrorMessage, ICEWarningMessage }; diff --git a/objective-c/test/Ice/ami/AllTests.m b/objective-c/test/Ice/ami/AllTests.m index 3f109737b43..d097ce71f70 100644 --- a/objective-c/test/Ice/ami/AllTests.m +++ b/objective-c/test/Ice/ami/AllTests.m @@ -617,7 +617,6 @@ amiAllTests(id<ICECommunicator> communicator, BOOL collocated) } tprintf("ok\n"); - tprintf("testing batch requests with communicator... "); { { @@ -685,7 +684,6 @@ amiAllTests(id<ICECommunicator> communicator, BOOL collocated) test(r1 == r1); test(r1 != r2); - if([p ice_getConnection]) { test(([r1 sentSynchronously] && [r1 isSent] && ![r1 isCompleted]) || diff --git a/objective-c/test/Ice/binding/AllTests.m b/objective-c/test/Ice/binding/AllTests.m index 713050a2ad5..e86a0123fbd 100644 --- a/objective-c/test/Ice/binding/AllTests.m +++ b/objective-c/test/Ice/binding/AllTests.m @@ -575,7 +575,6 @@ bindingAllTests(id<ICECommunicator> communicator) [com deactivateObjectAdapter:[adapters objectAtIndex:2]]; - test([[test getAdapterName] isEqualToString:@"Adapter52"]); deactivate(com, adapters); diff --git a/objective-c/test/Ice/binding/TestI.m b/objective-c/test/Ice/binding/TestI.m index 8524c9b6eb1..9c2ee441380 100644 --- a/objective-c/test/Ice/binding/TestI.m +++ b/objective-c/test/Ice/binding/TestI.m @@ -22,7 +22,6 @@ return self; } - -(id<TestBindingRemoteObjectAdapterPrx>) createObjectAdapter:(NSMutableString*)name endpoints:(NSMutableString*)endpts current:(ICECurrent*)current { diff --git a/objective-c/test/Ice/enums/AllTests.m b/objective-c/test/Ice/enums/AllTests.m index d7aa6c31cd3..5a3ef71ec7d 100644 --- a/objective-c/test/Ice/enums/AllTests.m +++ b/objective-c/test/Ice/enums/AllTests.m @@ -11,7 +11,6 @@ #import <TestCommon.h> #import <EnumTest.h> - TestEnumTestIntfPrx* enumAllTests(id<ICECommunicator> communicator) { @@ -379,8 +378,6 @@ enumAllTests(id<ICECommunicator> communicator) } } - - tprintf("ok\n"); return proxy; diff --git a/objective-c/test/Ice/exceptions/AllTests.m b/objective-c/test/Ice/exceptions/AllTests.m index c65792c71e3..f1356b1e836 100644 --- a/objective-c/test/Ice/exceptions/AllTests.m +++ b/objective-c/test/Ice/exceptions/AllTests.m @@ -504,7 +504,6 @@ exceptionsAllTests(id<ICECommunicator> communicator) test(false); } - tprintf("ok\n"); tprintf("catching unknown non-Ice exception... "); diff --git a/objective-c/test/Ice/exceptions/ExceptionsTest.ice b/objective-c/test/Ice/exceptions/ExceptionsTest.ice index 2379abe52a3..ed13e35c6c6 100644 --- a/objective-c/test/Ice/exceptions/ExceptionsTest.ice +++ b/objective-c/test/Ice/exceptions/ExceptionsTest.ice @@ -50,7 +50,6 @@ module Mod } } - interface Thrower { void shutdown(); diff --git a/objective-c/test/Ice/facets/AllTests.m b/objective-c/test/Ice/facets/AllTests.m index 2f523b0c948..ab8398c668f 100644 --- a/objective-c/test/Ice/facets/AllTests.m +++ b/objective-c/test/Ice/facets/AllTests.m @@ -11,7 +11,6 @@ #import <TestCommon.h> #import <FacetsTest.h> - @interface FacetsEmptyI : TestFacetsEmpty @end diff --git a/objective-c/test/Ice/hash/HashTest.ice b/objective-c/test/Ice/hash/HashTest.ice index 9b666914c28..6696be11589 100644 --- a/objective-c/test/Ice/hash/HashTest.ice +++ b/objective-c/test/Ice/hash/HashTest.ice @@ -13,7 +13,6 @@ module Test { - exception BaseException { } @@ -36,7 +35,6 @@ exception OtherException bool b; } - struct PointF { float x; diff --git a/objective-c/test/Ice/hold/Server.m b/objective-c/test/Ice/hold/Server.m index 4ef3089507e..33206b4ecb3 100644 --- a/objective-c/test/Ice/hold/Server.m +++ b/objective-c/test/Ice/hold/Server.m @@ -21,7 +21,6 @@ run(id<ICECommunicator> communicator) [[communicator getProperties] setProperty:@"TestAdapter1.ThreadPool.Serialize" value:@"0"]; id<ICEObjectAdapter> adapter1 = [communicator createObjectAdapter:@"TestAdapter1"]; - [[communicator getProperties] setProperty:@"TestAdapter2.Endpoints" value:@"default -p 12011 -t 10000:udp"]; [[communicator getProperties] setProperty:@"TestAdapter2.ThreadPool.Size" value:@"5"]; [[communicator getProperties] setProperty:@"TestAdapter2.ThreadPool.SizeMax" value:@"5"]; diff --git a/objective-c/test/Ice/hold/TestI.h b/objective-c/test/Ice/hold/TestI.h index 96e19829c60..cdf8397c4f3 100644 --- a/objective-c/test/Ice/hold/TestI.h +++ b/objective-c/test/Ice/hold/TestI.h @@ -7,7 +7,6 @@ // // ********************************************************************** - #import <HoldTest.h> #include <dispatch/dispatch.h> diff --git a/objective-c/test/Ice/hold/TestI.m b/objective-c/test/Ice/hold/TestI.m index 335c8eba800..2a5cc0d1501 100644 --- a/objective-c/test/Ice/hold/TestI.m +++ b/objective-c/test/Ice/hold/TestI.m @@ -123,7 +123,6 @@ return 0; } - -(void) setOneway:(ICEInt)value expected:(ICEInt)expected current:(ICECurrent*)current { @synchronized(self) diff --git a/objective-c/test/Ice/inheritance/AllTests.m b/objective-c/test/Ice/inheritance/AllTests.m index 81c74d99039..4f5a903d5c9 100644 --- a/objective-c/test/Ice/inheritance/AllTests.m +++ b/objective-c/test/Ice/inheritance/AllTests.m @@ -11,7 +11,6 @@ #import <TestCommon.h> #import <InheritanceTest.h> - id<TestInheritanceInitialPrx> inheritanceAllTests(id<ICECommunicator> communicator) { diff --git a/objective-c/test/Ice/metrics/AllTests.m b/objective-c/test/Ice/metrics/AllTests.m index 687918e441c..57ef77cc91b 100644 --- a/objective-c/test/Ice/metrics/AllTests.m +++ b/objective-c/test/Ice/metrics/AllTests.m @@ -201,7 +201,6 @@ NSCondition* cond; } @end - @interface InvokeOp : Operation -(id) init:(ICEObjectPrx*)proxy_; +(id) invokeOp:(ICEObjectPrx*)proxy_; @@ -1130,7 +1129,6 @@ metricsAllTests(id<ICECommunicator> communicator) tprintf("testing metrics view enable/disable..."); - [props setObject:@"none" forKey:@"IceMX.Metrics.View.GroupBy"]; [props setObject:@"0" forKey:@"IceMX.Metrics.View.Disabled"]; updateProps(clientProps, serverProps, update, props, @"Thread"); diff --git a/objective-c/test/Ice/objects/AllTests.m b/objective-c/test/Ice/objects/AllTests.m index cea5cc6e22a..3e6717bd642 100644 --- a/objective-c/test/Ice/objects/AllTests.m +++ b/objective-c/test/Ice/objects/AllTests.m @@ -618,6 +618,5 @@ objectsAllTests(id<ICECommunicator> communicator, BOOL collocated) // cross-test server does not implement this object } - return initial; } diff --git a/objective-c/test/Ice/objects/ObjectsTest.ice b/objective-c/test/Ice/objects/ObjectsTest.ice index 06ebcd245bc..a2a8b862068 100644 --- a/objective-c/test/Ice/objects/ObjectsTest.ice +++ b/objective-c/test/Ice/objects/ObjectsTest.ice @@ -37,7 +37,6 @@ class AbstractBase extends Base void op(); } - class B; class C; diff --git a/objective-c/test/Ice/objects/TestI.m b/objective-c/test/Ice/objects/TestI.m index 75977e5d138..b96e69253c5 100644 --- a/objective-c/test/Ice/objects/TestI.m +++ b/objective-c/test/Ice/objects/TestI.m @@ -161,7 +161,6 @@ return _b2; } - -(TestObjectsC*) getC:(ICECurrent*)current { _b1.preMarshalInvoked = NO; @@ -170,7 +169,6 @@ return _c; } - -(TestObjectsD*) getD:(ICECurrent*)current { _b1.preMarshalInvoked = NO; @@ -180,13 +178,11 @@ return _d; } - -(TestObjectsE*) getE:(ICECurrent*)current { return _e; } - -(TestObjectsF*) getF:(ICECurrent*)current { return _f; diff --git a/objective-c/test/Ice/operations/OperationsTest.ice b/objective-c/test/Ice/operations/OperationsTest.ice index 0186627b3b7..654afb00918 100644 --- a/objective-c/test/Ice/operations/OperationsTest.ice +++ b/objective-c/test/Ice/operations/OperationsTest.ice @@ -173,7 +173,6 @@ interface MyClass LongSS opShortIntLongSS(ShortSS p1, IntSS p2, LongSS p3, out ShortSS p4, out IntSS p5, out LongSS p6); - DoubleSS opFloatDoubleSS(FloatSS p1, DoubleSS p2, out FloatSS p3, out DoubleSS p4); @@ -326,7 +325,6 @@ interface MyDerivedClass extends MyClass MyStruct1 opMyStruct1(MyStruct1 c); } - // // String literals // diff --git a/objective-c/test/Ice/operations/TestI.m b/objective-c/test/Ice/operations/TestI.m index 1059d754513..1dd7d277063 100644 --- a/objective-c/test/Ice/operations/TestI.m +++ b/objective-c/test/Ice/operations/TestI.m @@ -682,7 +682,6 @@ return p; } - -(ICEFloat) opFloat1:(ICEFloat)p current:(ICECurrent*)current { return p; diff --git a/objective-c/test/Ice/operations/Twoways.m b/objective-c/test/Ice/operations/Twoways.m index f3d9dcb37d5..96495a55ce8 100644 --- a/objective-c/test/Ice/operations/Twoways.m +++ b/objective-c/test/Ice/operations/Twoways.m @@ -85,7 +85,6 @@ twoways(id<ICECommunicator> communicator, id<TestOperationsMyClassPrx> p) test([TestOperationss0 isEqualToString:[literals objectAtIndex: 0]]); - test([TestOperationss0 isEqualToString:@"\\"] && [TestOperationss0 isEqualToString:TestOperationssw0] && [TestOperationss0 isEqualToString:[literals objectAtIndex:0]] && @@ -1593,7 +1592,6 @@ twoways(id<ICECommunicator> communicator, id<TestOperationsMyClassPrx> p) TestOperationsMutableMyEnumMyEnumSD *sdi1 = [TestOperationsMutableMyEnumMyEnumSD dictionary]; TestOperationsMutableMyEnumMyEnumSD *sdi2 = [TestOperationsMutableMyEnumMyEnumSD dictionary]; - TestOperationsMyEnum buf1[] = { TestOperationsenum1, TestOperationsenum1, TestOperationsenum2 }; TestOperationsMyEnum buf2[] = { TestOperationsenum1, TestOperationsenum2 }; TestOperationsMyEnum buf3[] = { TestOperationsenum3, TestOperationsenum3 }; diff --git a/objective-c/test/Ice/operations/TwowaysAMI.m b/objective-c/test/Ice/operations/TwowaysAMI.m index 4b54b6ae273..20dbd7cd45e 100644 --- a/objective-c/test/Ice/operations/TwowaysAMI.m +++ b/objective-c/test/Ice/operations/TwowaysAMI.m @@ -1200,7 +1200,6 @@ twowaysAMI(id<ICECommunicator> communicator, id<TestOperationsMyClassPrx> p) [ssi2 addObject:@"xyz"]; - TestAMIOperationsCallback* cb = [TestAMIOperationsCallback create]; [p begin_opStringS:ssi1 p2:ssi2 response:^(TestOperationsMutableStringS* ret, TestOperationsMutableStringS* p3) { [cb opStringSResponse:ret p3:p3]; } exception:^(ICEException* ex) { [cb opStringSException:ex]; }]; test([cb check]); @@ -1398,7 +1397,6 @@ twowaysAMI(id<ICECommunicator> communicator, id<TestOperationsMyClassPrx> p) [di2 setObject:@"abc -100.4" forKey:@"FOO"]; [di2 setObject:@"abc 0.5" forKey:@"BAR"]; - TestAMIOperationsCallback* cb = [TestAMIOperationsCallback create]; [p begin_opStringStringD:di1 p2:di2 response:^(TestOperationsMutableStringStringD* ret, TestOperationsMutableStringStringD* p3) { [cb opStringStringDResponse:ret p3:p3]; } exception:^(ICEException* ex) { [cb opStringStringDException:ex]; }]; test([cb check]); @@ -1909,7 +1907,6 @@ twowaysAMI(id<ICECommunicator> communicator, id<TestOperationsMyClassPrx> p) TestOperationsMutableMyEnumMyEnumSD *sdi1 = [TestOperationsMutableMyEnumMyEnumSD dictionary]; TestOperationsMutableMyEnumMyEnumSD *sdi2 = [TestOperationsMutableMyEnumMyEnumSD dictionary]; - TestOperationsMyEnum buf1[] = { TestOperationsenum1, TestOperationsenum1, TestOperationsenum2 }; TestOperationsMyEnum buf2[] = { TestOperationsenum1, TestOperationsenum2 }; TestOperationsMyEnum buf3[] = { TestOperationsenum3, TestOperationsenum3 }; @@ -1978,7 +1975,6 @@ twowaysAMI(id<ICECommunicator> communicator, id<TestOperationsMyClassPrx> p) [p2 begin_opContext:^(ICEMutableContext* ctx) { [cb opNonEmptyContextResponse:ctx]; } exception:^(ICEException* ex) { [cb opContextException:ex]; }]; test([cb check]); - cb = [TestAMIOperationsCallback create]; [p2 begin_opContext:ctx response:^(ICEMutableContext* ctx) { [cb opNonEmptyContextResponse:ctx]; } exception:^(ICEException* ex) { [cb opContextException:ex]; }]; test([cb check]); @@ -2055,8 +2051,6 @@ twowaysAMI(id<ICECommunicator> communicator, id<TestOperationsMyClassPrx> p) } } - - { ICEDouble d = 1278312346.0 / 13.0; TestOperationsMutableDoubleS *ds = [TestOperationsMutableDoubleS dataWithLength:(5 * sizeof(ICEDouble))]; diff --git a/objective-c/test/Ice/servantLocator/TestI.h b/objective-c/test/Ice/servantLocator/TestI.h index fbeab7892fa..d46ba47bfb0 100644 --- a/objective-c/test/Ice/servantLocator/TestI.h +++ b/objective-c/test/Ice/servantLocator/TestI.h @@ -10,7 +10,6 @@ #import <objc/Ice.h> #import <ServantLocatorTest.h> - @interface TestServantLocatorTestIntfI : TestServantLocatorTestIntf<TestServantLocatorTestIntf> @end diff --git a/objective-c/test/Ice/slicing/exceptions/TestI.m b/objective-c/test/Ice/slicing/exceptions/TestI.m index 818a7f956db..c77d4a7c1bd 100644 --- a/objective-c/test/Ice/slicing/exceptions/TestI.m +++ b/objective-c/test/Ice/slicing/exceptions/TestI.m @@ -148,7 +148,6 @@ test(NO); } - -(void) shutdown:(ICECurrent*)current { [[current.adapter getCommunicator] shutdown]; diff --git a/objective-c/test/ios/controller/Classes/AppDelegate.h b/objective-c/test/ios/controller/Classes/AppDelegate.h index bdbf2a2e808..69088212d4b 100644 --- a/objective-c/test/ios/controller/Classes/AppDelegate.h +++ b/objective-c/test/ios/controller/Classes/AppDelegate.h @@ -13,5 +13,4 @@ @property (strong, nonatomic) UIWindow *window; - @end diff --git a/objective-c/test/ios/controller/Classes/AppDelegate.m b/objective-c/test/ios/controller/Classes/AppDelegate.m index 405da278fb7..74a582f002b 100644 --- a/objective-c/test/ios/controller/Classes/AppDelegate.m +++ b/objective-c/test/ios/controller/Classes/AppDelegate.m @@ -15,38 +15,31 @@ @implementation AppDelegate - - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { // Override point for customization after application launch. return YES; } - - (void)applicationWillResignActive:(UIApplication *)application { // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state. // Use this method to pause ongoing tasks, disable timers, and invalidate graphics rendering callbacks. Games should use this method to pause the game. } - - (void)applicationDidEnterBackground:(UIApplication *)application { // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later. // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits. } - - (void)applicationWillEnterForeground:(UIApplication *)application { // Called as part of the transition from the background to the active state; here you can undo many of the changes made on entering the background. } - - (void)applicationDidBecomeActive:(UIApplication *)application { // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface. } - - (void)applicationWillTerminate:(UIApplication *)application { // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:. } - @end diff --git a/php/src/php5/Connection.cpp b/php/src/php5/Connection.cpp index 3cad9981679..bdec7d1264b 100644 --- a/php/src/php5/Connection.cpp +++ b/php/src/php5/Connection.cpp @@ -747,7 +747,6 @@ IcePHP::createConnectionInfo(zval* zv, const Ice::ConnectionInfoPtr& p TSRMLS_DC add_property_string(zv, STRCAST("cipher"), const_cast<char*>(info->cipher.c_str()), 1); add_property_bool(zv, STRCAST("verified"), info->verified ? 1 : 0); - zval* zarr; MAKE_STD_ZVAL(zarr); AutoDestroy listDestroyer(zarr); diff --git a/php/src/php5/Types.cpp b/php/src/php5/Types.cpp index 9f55bf29e88..4692d68c991 100644 --- a/php/src/php5/Types.cpp +++ b/php/src/php5/Types.cpp @@ -3768,7 +3768,6 @@ ZEND_FUNCTION(IcePHP_defineProxy) zval* base; zval* interfaces; - if(zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, const_cast<char*>("so!a!"), &id, &idLen, &base, &interfaces) == FAILURE) { @@ -3893,7 +3892,6 @@ handleExceptionInfoFreeStorage(void* p TSRMLS_DC) efree(p); } - static bool createExceptionInfo(zval* zv, const ExceptionInfoPtr& p TSRMLS_DC) { diff --git a/php/src/php7/Connection.cpp b/php/src/php7/Connection.cpp index 262497601bc..4c67992750b 100644 --- a/php/src/php7/Connection.cpp +++ b/php/src/php7/Connection.cpp @@ -644,7 +644,6 @@ IcePHP::connectionInit(void) zend_declare_property_bool(sslConnectionInfoClassEntry, STRCAST("verified"), sizeof("verified") - 1, 0, ZEND_ACC_PUBLIC); - return true; } diff --git a/php/src/php7/Types.cpp b/php/src/php7/Types.cpp index 526e1963d04..aed89c552fa 100644 --- a/php/src/php7/Types.cpp +++ b/php/src/php7/Types.cpp @@ -3758,7 +3758,6 @@ handleExceptionInfoFreeStorage(zend_object* object) zend_object_std_dtor(object); } - static bool createExceptionInfo(zval* zv, const ExceptionInfoPtr& p) { diff --git a/php/test/Ice/acm/Client.php b/php/test/Ice/acm/Client.php index 70e6028ae22..ceda41cd6e1 100644 --- a/php/test/Ice/acm/Client.php +++ b/php/test/Ice/acm/Client.php @@ -49,7 +49,6 @@ function testSetACM($communicator, $com) $testCommunicator = $NS ? eval("return Ice\\initialize(\$initData);") : eval("return Ice_initialize(\$initData);"); - $proxy = $testCommunicator->stringToProxy($adapter->getTestIntf()->ice_toString())->ice_uncheckedCast( "::Test::TestIntf"); $proxy->ice_getConnection(); diff --git a/php/test/Ice/operations/Client.php b/php/test/Ice/operations/Client.php index 9d0b5331e92..3278dc8e335 100644 --- a/php/test/Ice/operations/Client.php +++ b/php/test/Ice/operations/Client.php @@ -42,7 +42,6 @@ function twoways($communicator, $p) $myDerivedClassPrxHelper = $NS ? "Test\\MyDerivedClassPrxHelper" : "Test_MyDerivedClassPrxHelper"; $objectPrxHelper = $NS ? "Ice\\ObjectPrxHelper" : "Ice_ObjectPrxHelper"; - $s0 = $NS ? constant("Test\\s0") : constant("Test_s0"); $s1 = $NS ? constant("Test\\s1") : constant("Test_s1"); $s2 = $NS ? constant("Test\\s2") : constant("Test_s2"); diff --git a/php/test/Ice/operations/Test.ice b/php/test/Ice/operations/Test.ice index 76ee0c41609..57714be2f8e 100644 --- a/php/test/Ice/operations/Test.ice +++ b/php/test/Ice/operations/Test.ice @@ -131,7 +131,6 @@ interface MyClass LongSS opShortIntLongSS(ShortSS p1, IntSS p2, LongSS p3, out ShortSS p4, out IntSS p5, out LongSS p6); - DoubleSS opFloatDoubleSS(FloatSS p1, DoubleSS p2, out FloatSS p3, out DoubleSS p4); diff --git a/php/test/Ice/optional/Client.php b/php/test/Ice/optional/Client.php index 2a4df75c57a..ce83f9c6a25 100644 --- a/php/test/Ice/optional/Client.php +++ b/php/test/Ice/optional/Client.php @@ -143,7 +143,6 @@ function allTests($communicator) test($mo1->bos == array(false, true, false)); - // // Test generated struct and classes compare with $none // @@ -347,7 +346,6 @@ function allTests($communicator) $initial->ice_encodingVersion($Ice_Encoding_1_0)->returnOptionalClass(true, $oo); test($oo == $none); - $gcls = $NS ? "Test\\G" : "Test_G"; $g1cls = $NS ? "Test\\G1" : "Test_G1"; $g2cls = $NS ? "Test\\G2" : "Test_G2"; diff --git a/php/test/Ice/timeout/Client.php b/php/test/Ice/timeout/Client.php index 8fa55071285..8794739f81a 100644 --- a/php/test/Ice/timeout/Client.php +++ b/php/test/Ice/timeout/Client.php @@ -396,7 +396,6 @@ function allTests($communicator) $communicator->destroy(); } - $initData = eval($NS ? "return new Ice\\InitializationData();" : "return new Ice_InitializationData();"); $initData->properties = eval($NS ? "return Ice\\createProperties(\$argv);" : "return Ice_createProperties(\$argv);"); diff --git a/python/modules/IcePy/Communicator.cpp b/python/modules/IcePy/Communicator.cpp index ef4472f325f..89cb5f8030d 100644 --- a/python/modules/IcePy/Communicator.cpp +++ b/python/modules/IcePy/Communicator.cpp @@ -1147,7 +1147,6 @@ communicatorFindAdminFacet(CommunicatorObject* self, PyObject* args) return Py_None; } - #ifdef WIN32 extern "C" #endif @@ -1175,7 +1174,6 @@ communicatorFindAllAdminFacets(CommunicatorObject* self) PyTypeObject* objectType = reinterpret_cast<PyTypeObject*>(lookupType("Ice.Object")); PyObjectHandle plainObject = objectType->tp_alloc(objectType, 0); - for(Ice::FacetMap::const_iterator p = facetMap.begin(); p != facetMap.end(); ++p) { @@ -1204,8 +1202,6 @@ communicatorFindAllAdminFacets(CommunicatorObject* self) return result.release(); } - - #ifdef WIN32 extern "C" #endif @@ -1434,7 +1430,6 @@ communicatorGetImplicitContext(CommunicatorObject* self) return createImplicitContext(implicitContext); } - #ifdef WIN32 extern "C" #endif diff --git a/python/modules/IcePy/Logger.cpp b/python/modules/IcePy/Logger.cpp index 68357c8dadb..b98320375dc 100644 --- a/python/modules/IcePy/Logger.cpp +++ b/python/modules/IcePy/Logger.cpp @@ -101,7 +101,6 @@ IcePy::LoggerWrapper::getPrefix() return getString(tmp.get()); } - Ice::LoggerPtr IcePy::LoggerWrapper::cloneWithPrefix(const string& prefix) { @@ -307,7 +306,6 @@ loggerGetPrefix(LoggerObject* self) return createString(prefix); } - #ifdef WIN32 extern "C" #endif diff --git a/python/modules/IcePy/ObjectAdapter.cpp b/python/modules/IcePy/ObjectAdapter.cpp index 9beb09d1f52..7f9410b431d 100644 --- a/python/modules/IcePy/ObjectAdapter.cpp +++ b/python/modules/IcePy/ObjectAdapter.cpp @@ -1513,7 +1513,6 @@ adapterSetLocator(ObjectAdapterObject* self, PyObject* args) return Py_None; } - #ifdef WIN32 extern "C" #endif @@ -1676,7 +1675,6 @@ adapterSetPublishedEndpoints(ObjectAdapterObject* self, PyObject* args) return Py_None; } - static PyMethodDef AdapterMethods[] = { { STRCAST("getName"), reinterpret_cast<PyCFunction>(adapterGetName), METH_NOARGS, diff --git a/python/modules/IcePy/Properties.cpp b/python/modules/IcePy/Properties.cpp index bbcca6b179b..579853e02c2 100644 --- a/python/modules/IcePy/Properties.cpp +++ b/python/modules/IcePy/Properties.cpp @@ -406,8 +406,6 @@ propertiesGetPropertyAsListWithDefault(PropertiesObject* self, PyObject* args) return list; } - - #ifdef WIN32 extern "C" #endif diff --git a/python/modules/IcePy/Proxy.cpp b/python/modules/IcePy/Proxy.cpp index fd44da8defc..be082198227 100644 --- a/python/modules/IcePy/Proxy.cpp +++ b/python/modules/IcePy/Proxy.cpp @@ -1142,7 +1142,6 @@ proxyIceSecure(ProxyObject* self, PyObject* args) return createProxy(newProxy, *self->communicator, reinterpret_cast<PyObject*>(Py_TYPE(self))); } - #ifdef WIN32 extern "C" #endif diff --git a/python/modules/IcePy/Types.h b/python/modules/IcePy/Types.h index eb122bc6171..5ca3d2296dc 100644 --- a/python/modules/IcePy/Types.h +++ b/python/modules/IcePy/Types.h @@ -30,7 +30,6 @@ class ClassInfo; typedef IceUtil::Handle<ClassInfo> ClassInfoPtr; typedef std::vector<ClassInfoPtr> ClassInfoList; - class ValueInfo; typedef IceUtil::Handle<ValueInfo> ValueInfoPtr; diff --git a/python/python/Ice/__init__.py b/python/python/Ice/__init__.py index 207ad392129..500d2e5aa27 100644 --- a/python/python/Ice/__init__.py +++ b/python/python/Ice/__init__.py @@ -1317,7 +1317,6 @@ class ImplicitContextI(ImplicitContext): def remove(self, key): return self._impl.remove(key) - # # Its not possible to block in a python signal handler since this # blocks the main thread from doing further work. As such we queue the diff --git a/python/test/Ice/admin/AllTests.py b/python/test/Ice/admin/AllTests.py index 6f590408f6f..4a025ed3953 100644 --- a/python/test/Ice/admin/AllTests.py +++ b/python/test/Ice/admin/AllTests.py @@ -71,7 +71,6 @@ def testFacets(com, builtInFacets = True): except Ice.NotRegisteredException: pass # Expected - def allTests(communicator): sys.stdout.write("testing communicator operations... ") sys.stdout.flush() diff --git a/python/test/Ice/blobject/Server.py b/python/test/Ice/blobject/Server.py index ce5c7dae040..09fb77c6286 100755 --- a/python/test/Ice/blobject/Server.py +++ b/python/test/Ice/blobject/Server.py @@ -29,7 +29,6 @@ class TestI(Test.Hello): def shutdown(self, current=None): current.adapter.getCommunicator().shutdown() - def run(args, communicator): communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp") adapter = communicator.createObjectAdapter("TestAdapter") diff --git a/python/test/Ice/defaultValue/Test.ice b/python/test/Ice/defaultValue/Test.ice index 64021441f21..d0288b398e4 100644 --- a/python/test/Ice/defaultValue/Test.ice +++ b/python/test/Ice/defaultValue/Test.ice @@ -23,7 +23,6 @@ enum Color { red, green, blue } } - struct Struct1 { bool boolFalse = false; diff --git a/python/test/Ice/exceptions/AllTests.py b/python/test/Ice/exceptions/AllTests.py index fdfc2bddca6..4fb500d88b4 100644 --- a/python/test/Ice/exceptions/AllTests.py +++ b/python/test/Ice/exceptions/AllTests.py @@ -237,7 +237,6 @@ def allTests(communicator): except Ice.IllegalServantException: pass - adapter.remove(Ice.stringToIdentity("x")) try: adapter.remove(Ice.stringToIdentity("x")) @@ -464,7 +463,6 @@ def allTests(communicator): print("ok") - if thrower.ice_getConnection(): sys.stdout.write("testing memory limit marshal exception..."); sys.stdout.flush(); diff --git a/python/test/Ice/operations/Twoways.py b/python/test/Ice/operations/Twoways.py index 53489803ce5..a90c1649a8a 100644 --- a/python/test/Ice/operations/Twoways.py +++ b/python/test/Ice/operations/Twoways.py @@ -1308,7 +1308,6 @@ def twoways(communicator, p): for j in range(len(r)): test(r[j] == -j) - # # opContext # diff --git a/python/test/Ice/operations/TwowaysAMI.py b/python/test/Ice/operations/TwowaysAMI.py index 735e526b68a..90c7299635e 100644 --- a/python/test/Ice/operations/TwowaysAMI.py +++ b/python/test/Ice/operations/TwowaysAMI.py @@ -1177,7 +1177,6 @@ def twowaysAMI(communicator, p): derived.begin_opDerived(cb.opDerived, cb.exCB) cb.check() - r = p.begin_opByte1(0xFF) test(p.end_opByte1(r) == 0xFF) diff --git a/python/test/Ice/properties/Client.py b/python/test/Ice/properties/Client.py index b9774d51f92..7d14c2bccc8 100644 --- a/python/test/Ice/properties/Client.py +++ b/python/test/Ice/properties/Client.py @@ -9,7 +9,6 @@ # # ********************************************************************** - import os, sys, traceback import Ice @@ -26,7 +25,6 @@ class Client(Ice.Application): test(properties.getProperty("Ice.ProgramName") == "PropertiesClient") test(self.appName() == properties.getProperty("Ice.ProgramName")) - sys.stdout.write("testing load properties from UTF-8 path... ") sys.stdout.flush() properties = Ice.createProperties() diff --git a/python/test/Ice/properties/config/escapes.cfg b/python/test/Ice/properties/config/escapes.cfg index bd7c16643d9..a9d91a0a19f 100644 --- a/python/test/Ice/properties/config/escapes.cfg +++ b/python/test/Ice/properties/config/escapes.cfg @@ -22,7 +22,6 @@ foo\=bar=1 # Name is "foo=bar", value is "1" foo\#bar = 2 # Name is "foo#bar", value is "2" foo bar =3 # Name is "foo bar", value is "3" - A=1 # Name is "A", value is "1" B= 2 3 4 # Name is "B", value is "2 3 4" C=5=\#6 # 7 # Name is "C", value is "5=#6" diff --git a/python/test/Ice/proxy/AllTests.py b/python/test/Ice/proxy/AllTests.py index 8c34f28cc29..75ba821c0fa 100644 --- a/python/test/Ice/proxy/AllTests.py +++ b/python/test/Ice/proxy/AllTests.py @@ -359,7 +359,6 @@ def allTests(communicator, collocated): sys.stdout.write("testing proxy methods... ") sys.stdout.flush() - test(communicator.identityToString(base.ice_identity(communicator.stringToIdentity("other")).ice_getIdentity()) \ == "other") diff --git a/python/test/Ice/servantLocator/TestActivationAMDI.py b/python/test/Ice/servantLocator/TestActivationAMDI.py index 4c54569c4b2..0eac2d1cf80 100644 --- a/python/test/Ice/servantLocator/TestActivationAMDI.py +++ b/python/test/Ice/servantLocator/TestActivationAMDI.py @@ -10,7 +10,6 @@ import os, sys, traceback, time import Ice, Test, TestAMDI - class TestActivationAMDI(Test.TestActivation): def activateServantLocator(self, activate, current=None): diff --git a/python/test/Ice/servantLocator/TestActivationI.py b/python/test/Ice/servantLocator/TestActivationI.py index 1e52844a9f5..3e9b28d8154 100644 --- a/python/test/Ice/servantLocator/TestActivationI.py +++ b/python/test/Ice/servantLocator/TestActivationI.py @@ -10,7 +10,6 @@ import os, sys, traceback, time import Ice, Test, TestI - class TestActivationI(Test.TestActivation): def activateServantLocator(self, activate, current=None): diff --git a/python/test/Ice/timeout/AllTests.py b/python/test/Ice/timeout/AllTests.py index 986fb129380..b1a521e925f 100644 --- a/python/test/Ice/timeout/AllTests.py +++ b/python/test/Ice/timeout/AllTests.py @@ -272,5 +272,4 @@ def allTests(communicator): print("ok") - return timeout diff --git a/ruby/ruby/Ice.rb b/ruby/ruby/Ice.rb index df98c136b96..2d0772b7c21 100644 --- a/ruby/ruby/Ice.rb +++ b/ruby/ruby/Ice.rb @@ -143,7 +143,6 @@ module Ice T_ObjectPrx.defineProxy(ObjectPrx, nil, []) - class InterfaceByValue < Value def initialize(id) @id = id @@ -356,7 +355,6 @@ module Ice } end - @@_self = nil end diff --git a/ruby/src/IceRuby/Communicator.cpp b/ruby/src/IceRuby/Communicator.cpp index efa32357b08..d410b64b61c 100644 --- a/ruby/src/IceRuby/Communicator.cpp +++ b/ruby/src/IceRuby/Communicator.cpp @@ -302,7 +302,6 @@ IceRuby_identityToString(int argc, VALUE* argv, VALUE self) Ice::Identity ident = getIdentity(argv[0]); - Ice::ToStringMode toStringMode = Ice::Unicode; if(argc == 2) { @@ -541,7 +540,6 @@ IceRuby_Communicator_getImplicitContext(VALUE self) return Qnil; } - extern "C" VALUE IceRuby_Communicator_getProperties(VALUE self) diff --git a/ruby/src/IceRuby/Endpoint.cpp b/ruby/src/IceRuby/Endpoint.cpp index 70893f481ca..2491151f7ba 100644 --- a/ruby/src/IceRuby/Endpoint.cpp +++ b/ruby/src/IceRuby/Endpoint.cpp @@ -115,7 +115,6 @@ IceRuby_Endpoint_equals(VALUE self, VALUE other) return IceRuby_Endpoint_cmp(self, other) == INT2NUM(0) ? Qtrue : Qfalse; } - // ********************************************************************** // EndpointInfo // ********************************************************************** diff --git a/ruby/src/IceRuby/ImplicitContext.cpp b/ruby/src/IceRuby/ImplicitContext.cpp index e7bc0fa3853..31df9584d67 100644 --- a/ruby/src/IceRuby/ImplicitContext.cpp +++ b/ruby/src/IceRuby/ImplicitContext.cpp @@ -25,7 +25,6 @@ IceRuby_ImplicitContext_free(Ice::ImplicitContextPtr* p) delete p; } - extern "C" VALUE IceRuby_ImplicitContext_getContext(VALUE self) @@ -78,7 +77,6 @@ IceRuby_ImplicitContext_containsKey(VALUE self, VALUE key) return Qnil; } - extern "C" VALUE IceRuby_ImplicitContext_get(VALUE self, VALUE key) @@ -94,7 +92,6 @@ IceRuby_ImplicitContext_get(VALUE self, VALUE key) return Qnil; } - extern "C" VALUE IceRuby_ImplicitContext_put(VALUE self, VALUE key, VALUE value) @@ -124,7 +121,6 @@ IceRuby_ImplicitContext_remove(VALUE self, VALUE key) return Qnil; } - void IceRuby::initImplicitContext(VALUE iceModule) { diff --git a/ruby/src/IceRuby/Makefile.mk b/ruby/src/IceRuby/Makefile.mk index 351c72df5ed..7fc6859bb60 100644 --- a/ruby/src/IceRuby/Makefile.mk +++ b/ruby/src/IceRuby/Makefile.mk @@ -24,7 +24,6 @@ IceRuby_extra_sources := $(filter-out %Util.cpp %Python.cpp,\ $(top_srcdir)/cpp/src/Slice/RubyUtil.cpp \ $(top_srcdir)/cpp/src/Slice/StringLiteralUtil.cpp - # # On the default platform, always write the module in the ruby directory. # diff --git a/ruby/test/Ice/exceptions/Test.ice b/ruby/test/Ice/exceptions/Test.ice index c229d303893..2cdab0346c0 100644 --- a/ruby/test/Ice/exceptions/Test.ice +++ b/ruby/test/Ice/exceptions/Test.ice @@ -48,7 +48,6 @@ module Mod } } - interface Thrower { void shutdown(); diff --git a/ruby/test/Ice/objects/AllTests.rb b/ruby/test/Ice/objects/AllTests.rb index a4d5d235ec8..b74df84340c 100644 --- a/ruby/test/Ice/objects/AllTests.rb +++ b/ruby/test/Ice/objects/AllTests.rb @@ -9,7 +9,6 @@ require './TestI.rb' - class II < ::Ice::InterfaceByValue def initialize() super("::Test::I") @@ -22,7 +21,6 @@ class JI < ::Ice::InterfaceByValue end end - # # Ice for Ruby behaves differently than Ice for C++, because # collocated invocations are still sent "over the wire". Therefore diff --git a/ruby/test/Ice/operations/Test.ice b/ruby/test/Ice/operations/Test.ice index 228bd522429..cf72cba9a89 100644 --- a/ruby/test/Ice/operations/Test.ice +++ b/ruby/test/Ice/operations/Test.ice @@ -143,7 +143,6 @@ interface MyClass LongSS opShortIntLongSS(ShortSS p1, IntSS p2, LongSS p3, out ShortSS p4, out IntSS p5, out LongSS p6); - DoubleSS opFloatDoubleSS(FloatSS p1, DoubleSS p2, out FloatSS p3, out DoubleSS p4); diff --git a/ruby/test/Ice/operations/Twoways.rb b/ruby/test/Ice/operations/Twoways.rb index 3d7e38ed582..ff920831464 100644 --- a/ruby/test/Ice/operations/Twoways.rb +++ b/ruby/test/Ice/operations/Twoways.rb @@ -8,7 +8,6 @@ # # ********************************************************************** - def twoways(communicator, p) literals = p.opStringLiterals(); diff --git a/ruby/test/Ice/properties/Client.rb b/ruby/test/Ice/properties/Client.rb index 0e104b728cc..028d1f23411 100644 --- a/ruby/test/Ice/properties/Client.rb +++ b/ruby/test/Ice/properties/Client.rb @@ -9,7 +9,6 @@ # # ********************************************************************** - require 'Ice' def test(b) @@ -32,7 +31,6 @@ class Client < Ice::Application end end - print "testing load properties from UTF-8 path... " properties = Ice.createProperties(ARGV) properties.load("./config/中国_client.config") @@ -52,7 +50,6 @@ test(properties.getProperty("Config2") == "Config2"); test(properties.getProperty("Config3") == "Config3"); puts "ok" - print "testing configuration file escapes... " properties = Ice.createProperties(["--Ice.Config=config/escapes.cfg"]) @@ -83,5 +80,4 @@ props.each do |key, value| end puts "ok" - exit(0) diff --git a/ruby/test/Ice/properties/config/escapes.cfg b/ruby/test/Ice/properties/config/escapes.cfg index bd7c16643d9..a9d91a0a19f 100644 --- a/ruby/test/Ice/properties/config/escapes.cfg +++ b/ruby/test/Ice/properties/config/escapes.cfg @@ -22,7 +22,6 @@ foo\=bar=1 # Name is "foo=bar", value is "1" foo\#bar = 2 # Name is "foo#bar", value is "2" foo bar =3 # Name is "foo bar", value is "3" - A=1 # Name is "A", value is "1" B= 2 3 4 # Name is "B", value is "2 3 4" C=5=\#6 # 7 # Name is "C", value is "5=#6" diff --git a/ruby/test/Slice/escape/Client.rb b/ruby/test/Slice/escape/Client.rb index 1e260dee854..253b2c58b3e 100755 --- a/ruby/test/Slice/escape/Client.rb +++ b/ruby/test/Slice/escape/Client.rb @@ -32,7 +32,6 @@ def test(b) end end - def run(args, communicator) print "testing type names... " STDOUT.flush diff --git a/scripts/Expect.py b/scripts/Expect.py index fbb2bfbe8c5..ed0e349fadc 100755 --- a/scripts/Expect.py +++ b/scripts/Expect.py @@ -541,7 +541,6 @@ class Expect (object): def terminate(self): """Terminate the process.""" - if self.p is None: return diff --git a/scripts/Util.py b/scripts/Util.py index 4caa4a3d0fa..09efbcf5b99 100644 --- a/scripts/Util.py +++ b/scripts/Util.py @@ -408,7 +408,6 @@ def parseOptions(obj, options, mapped={}): remaining.append((o, a)) options[:] = remaining - class Mapping: mappings = OrderedDict() @@ -1867,7 +1866,6 @@ class RemoteProcessController(ProcessController): return self.processControllerProxies[ident] raise RuntimeError("couldn't reach the remote controller `{0}'".format(ident)) - def setProcessController(self, proxy): with self.cond: self.processControllerProxies[proxy.ice_getIdentity()] = proxy @@ -2041,7 +2039,6 @@ class AndroidProcessController(RemoteProcessController): sys.stdout.flush() time.sleep(0.5) - class iOSSimulatorProcessController(RemoteProcessController): device = "iOSSimulatorProcessController" @@ -2586,7 +2583,6 @@ class Driver: self.communicator.destroy() self.ctrlCHandler.destroy() - class CppMapping(Mapping): class Config(Mapping.Config): diff --git a/scripts/icehashpassword.py b/scripts/icehashpassword.py index 9a0a6e138d1..d63e602bf63 100644 --- a/scripts/icehashpassword.py +++ b/scripts/icehashpassword.py @@ -13,7 +13,6 @@ import sys, getopt, passlib.hash, passlib.hosts, getpass usePBKDF2 = any(sys.platform == p for p in ["win32", "darwin", "cygwin"]) useCryptExt = any(sys.platform.startswith(p) for p in ["linux", "freebsd", "gnukfreebsd"]) - def usage(): print("Usage: icehashpassword [options]") print("") diff --git a/scripts/tests/Ice/optional.py b/scripts/tests/Ice/optional.py index fdc01a95007..fad96d8e345 100644 --- a/scripts/tests/Ice/optional.py +++ b/scripts/tests/Ice/optional.py @@ -7,7 +7,6 @@ # # ********************************************************************** - testcases = [ ClientServerTestCase("client/server with compact format"), ClientServerTestCase("client/server with sliced format", props={ "Ice.Default.SlicedFormat" : True }), diff --git a/scripts/tests/Ice/stream.py b/scripts/tests/Ice/stream.py index b65bbe148ce..8e7352ebf88 100644 --- a/scripts/tests/Ice/stream.py +++ b/scripts/tests/Ice/stream.py @@ -7,7 +7,6 @@ # # ********************************************************************** - TestSuite(__name__, [ ClientTestCase("client with default encoding"), ClientTestCase("client with 1.0 encoding", props={ "Ice.Default.EncodingVersion" : "1.0" }) diff --git a/scripts/tests/IceSSL/configuration.py b/scripts/tests/IceSSL/configuration.py index 21915ce6c01..00f8701b8f7 100644 --- a/scripts/tests/IceSSL/configuration.py +++ b/scripts/tests/IceSSL/configuration.py @@ -76,7 +76,6 @@ outfilters = [ lambda x: re.sub("-! .* warning: deprecated property: IceSSL.KeyF # options=lambda current: { "protocol": ["ssl", "wss"] } if current.config.uwp else {} - TestSuite(__name__, [ ConfigurationTestCase(client=IceSSLConfigurationClient(outfilters=outfilters, args=['"{testdir}"']), server=IceSSLConfigurationServer(outfilters=outfilters, args=['"{testdir}"'])) diff --git a/slice/Ice/Communicator.ice b/slice/Ice/Communicator.ice index 11a9de91739..02c892940ae 100644 --- a/slice/Ice/Communicator.ice +++ b/slice/Ice/Communicator.ice @@ -600,7 +600,6 @@ local interface Communicator FacetMap findAllAdminFacets(); } - /** * The output mode for xxxToString method such as identityToString and proxyToString. * The actual encoding format for the string is the same for all modes: you diff --git a/slice/Ice/Instrumentation.ice b/slice/Ice/Instrumentation.ice index 590cbd0243a..09c478fe2f7 100644 --- a/slice/Ice/Instrumentation.ice +++ b/slice/Ice/Instrumentation.ice @@ -175,7 +175,6 @@ local enum ConnectionState ConnectionStateClosed } - /** * * The connection observer interface to instrument Ice connections. @@ -244,7 +243,6 @@ local interface ChildInvocationObserver extends Observer void reply(int size); } - /** * * The remote observer to instrument invocations that are sent over diff --git a/slice/Ice/LocalException.ice b/slice/Ice/LocalException.ice index a4feb7cab9c..e74e69887ed 100644 --- a/slice/Ice/LocalException.ice +++ b/slice/Ice/LocalException.ice @@ -423,7 +423,6 @@ local exception IllegalServantException string reason; } - /** * * This exception is raised if a request failed. This exception, and @@ -964,7 +963,6 @@ local exception StringConversionException extends MarshalException { } - /** * * This exception indicates a malformed data encapsulation. @@ -993,7 +991,6 @@ local exception FeatureNotSupportedException string unsupportedFeature; } - /** * * This exception indicates a failure in a security subsystem, diff --git a/slice/Ice/Process.ice b/slice/Ice/Process.ice index ea6fc3cff71..3779ff1c6e0 100644 --- a/slice/Ice/Process.ice +++ b/slice/Ice/Process.ice @@ -42,7 +42,6 @@ interface Process **/ void shutdown(); - /** * * Write a message on the process' stdout or stderr. diff --git a/slice/Ice/Properties.ice b/slice/Ice/Properties.ice index 59cd7034c91..4cdb67b0a05 100644 --- a/slice/Ice/Properties.ice +++ b/slice/Ice/Properties.ice @@ -95,7 +95,6 @@ local interface Properties **/ int getPropertyAsIntWithDefault(string key, int \value); - /** * * Get a property as a list of strings. The strings must be diff --git a/slice/Ice/RemoteLogger.ice b/slice/Ice/RemoteLogger.ice index 43caa57f4b1..f2b2e495a17 100644 --- a/slice/Ice/RemoteLogger.ice +++ b/slice/Ice/RemoteLogger.ice @@ -58,7 +58,6 @@ enum LogMessageType ErrorMessage } - /** * * A sequence of {@link LogMessageType} @@ -66,7 +65,6 @@ enum LogMessageType **/ sequence<LogMessageType> LogMessageTypeSeq; - /** * * A complete log message. @@ -105,7 +103,6 @@ struct LogMessage string message; } - /** * * A sequence of {@link LogMessage}. @@ -114,7 +111,6 @@ struct LogMessage ["cpp:type:std::list<LogMessage>"] sequence<LogMessage> LogMessageSeq; - /** * * The Ice remote logger interface. An application can implement a @@ -139,7 +135,6 @@ interface RemoteLogger **/ void init(string prefix, LogMessageSeq logMessages); - /** * * Log a {@link LogMessage}. Note that log may be called by {@link LoggerAdmin} @@ -153,7 +148,6 @@ interface RemoteLogger void log(LogMessage message); } - /** * * An exception thrown by {@link LoggerAdmin#attachRemoteLogger} to report diff --git a/slice/IceBox/IceBox.ice b/slice/IceBox/IceBox.ice index 13f3c9f6d73..60fd6db7a17 100644 --- a/slice/IceBox/IceBox.ice +++ b/slice/IceBox/IceBox.ice @@ -51,7 +51,6 @@ local exception FailureException string reason; } - /** * * This exception is thrown if an attempt is made to start an @@ -120,7 +119,6 @@ local interface Service void stop(); } - /** * * An Observer interface implemented by admin clients @@ -135,7 +133,6 @@ interface ServiceObserver void servicesStopped(Ice::StringSeq services); } - /** * * Administers a set of {@link Service} instances. @@ -178,7 +175,6 @@ interface ServiceManager void stopService(string service) throws AlreadyStoppedException, NoSuchServiceException; - /** * * Registers a new observer with the ServiceManager. diff --git a/slice/IceGrid/Admin.ice b/slice/IceGrid/Admin.ice index 6d62124a22a..cb94873e479 100644 --- a/slice/IceGrid/Admin.ice +++ b/slice/IceGrid/Admin.ice @@ -454,7 +454,6 @@ interface Admin void updateApplication(ApplicationUpdateDescriptor descriptor) throws AccessDeniedException, DeploymentException, ApplicationNotExistException; - /** * * Synchronize a deployed application with the given application @@ -1048,7 +1047,6 @@ interface Admin ["nonmutating", "cpp:const"] idempotent NodeInfo getNodeInfo(string name) throws NodeNotExistException, NodeUnreachableException; - /** * * Get a proxy to the IceGrid node's admin object. @@ -1657,7 +1655,6 @@ interface AdminSession extends Glacier2::Session **/ ["nonmutating", "cpp:const"] idempotent Admin* getAdmin(); - /** * * Get a "template" proxy for admin callback objects. @@ -1671,7 +1668,6 @@ interface AdminSession extends Glacier2::Session **/ ["cpp:const"] idempotent Object* getAdminCallbackTemplate(); - /** * * Set the observer proxies that receive diff --git a/slice/IceGrid/Exception.ice b/slice/IceGrid/Exception.ice index f8271027971..4b6e91f6b41 100644 --- a/slice/IceGrid/Exception.ice +++ b/slice/IceGrid/Exception.ice @@ -236,7 +236,6 @@ exception ServerUnreachableException string reason; } - /** * * This exception is raised if a registry could not be reached. @@ -388,5 +387,4 @@ exception FileNotAvailableException string reason; } - } diff --git a/slice/IceGrid/PluginFacade.ice b/slice/IceGrid/PluginFacade.ice index 4ad1a164206..97f1103f937 100644 --- a/slice/IceGrid/PluginFacade.ice +++ b/slice/IceGrid/PluginFacade.ice @@ -90,7 +90,6 @@ local interface TypeFilter Ice::ObjectProxySeq filter(string type, Ice::ObjectProxySeq proxies, Ice::Connection con, Ice::Context ctx); } - /** * * The RegistryPluginFacade is implemented by IceGrid and can be used diff --git a/slice/IcePatch2/FileInfo.ice b/slice/IcePatch2/FileInfo.ice index a07adf0378b..822e6f69bda 100644 --- a/slice/IcePatch2/FileInfo.ice +++ b/slice/IcePatch2/FileInfo.ice @@ -49,7 +49,6 @@ struct FileInfo **/ sequence<FileInfo> FileInfoSeq; - /** * * Basic information about a single file. diff --git a/slice/IceStorm/IceStorm.ice b/slice/IceStorm/IceStorm.ice index b28a3d94af5..2a98bef21eb 100644 --- a/slice/IceStorm/IceStorm.ice +++ b/slice/IceStorm/IceStorm.ice @@ -200,7 +200,6 @@ interface Topic **/ ["nonmutating", "cpp:const"] idempotent Object* getNonReplicatedPublisher(); - /** * * Subscribe with the given <tt>qos</tt> to this topic. A |