summaryrefslogtreecommitdiff
path: root/cpp/include
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/include')
-rw-r--r--cpp/include/Ice/CommunicatorAsync.h1
-rw-r--r--cpp/include/Ice/Exception.h2
-rw-r--r--cpp/include/Ice/FactoryTableInit.h1
-rw-r--r--cpp/include/Ice/IncomingAsync.h1
-rw-r--r--cpp/include/Ice/Initialize.h2
-rw-r--r--cpp/include/Ice/InputStream.h1
-rw-r--r--cpp/include/Ice/MetricsAdminI.h2
-rw-r--r--cpp/include/Ice/MetricsObserverI.h1
-rw-r--r--cpp/include/Ice/Optional.h33
-rw-r--r--cpp/include/Ice/Proxy.h7
-rw-r--r--cpp/include/Ice/StreamHelpers.h7
-rw-r--r--cpp/include/IceSSL/Plugin.h1
-rw-r--r--cpp/include/IceUtil/Atomic.h2
-rw-r--r--cpp/include/IceUtil/Cond.h1
-rw-r--r--cpp/include/IceUtil/Config.h3
-rw-r--r--cpp/include/IceUtil/DisableWarnings.h2
-rw-r--r--cpp/include/IceUtil/Exception.h5
-rw-r--r--cpp/include/IceUtil/Lock.h2
-rw-r--r--cpp/include/IceUtil/Monitor.h1
-rw-r--r--cpp/include/IceUtil/RecMutex.h1
-rw-r--r--cpp/include/IceUtil/ScannerConfig.h1
-rw-r--r--cpp/include/IceUtil/ScopedArray.h1
-rw-r--r--cpp/include/IceUtil/StringConverter.h2
-rw-r--r--cpp/include/IceUtil/Timer.h1
24 files changed, 0 insertions, 81 deletions
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.
//
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-03 23:37:31 +0000