summaryrefslogtreecommitdiff
path: root/cpp/include
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/include')
-rw-r--r--cpp/include/Freeze/Initialize.h8
-rw-r--r--cpp/include/Freeze/Map.h72
-rw-r--r--cpp/include/Ice/CommunicatorAsync.h8
-rw-r--r--cpp/include/Ice/ConnectionAsync.h8
-rw-r--r--cpp/include/Ice/Proxy.h113
-rw-r--r--cpp/include/IceUtil/Cache.h10
-rw-r--r--cpp/include/IceUtil/Config.h34
-rw-r--r--cpp/include/IceUtil/DisableWarnings.h5
-rw-r--r--cpp/include/IceUtil/FileUtil.h18
-rw-r--r--cpp/include/IceUtil/Functional.h64
-rw-r--r--cpp/include/IceUtil/OutputUtil.h20
11 files changed, 3 insertions, 357 deletions
diff --git a/cpp/include/Freeze/Initialize.h b/cpp/include/Freeze/Initialize.h
index 29a165e5506..931bd58aeb6 100644
--- a/cpp/include/Freeze/Initialize.h
+++ b/cpp/include/Freeze/Initialize.h
@@ -47,11 +47,7 @@ FREEZE_API TransactionalEvictorPtr
createTransactionalEvictor(const Ice::ObjectAdapterPtr& adapter,
const std::string& envName,
const std::string& filename,
-#if defined(_MSC_VER) && (_MSC_VER < 1300)
- const FacetTypeMap& facetTypes = FacetTypeMap(std::less<std::string>()),
-#else
const FacetTypeMap& facetTypes = FacetTypeMap(),
-#endif
const ServantInitializerPtr& initializer = 0,
const std::vector<IndexPtr>& indices = std::vector<IndexPtr>(),
bool createDb = true);
@@ -61,11 +57,7 @@ createTransactionalEvictor(const Ice::ObjectAdapterPtr& adapter,
const std::string& envName,
DbEnv& dbEnv,
const std::string& filename,
-#if defined(_MSC_VER) && (_MSC_VER < 1300)
- const FacetTypeMap& facetTypes = FacetTypeMap(std::less<std::string>()),
-#else
const FacetTypeMap& facetTypes = FacetTypeMap(),
-#endif
const ServantInitializerPtr& initializer = 0,
const std::vector<IndexPtr>& indices = std::vector<IndexPtr>(),
bool createDb = true);
diff --git a/cpp/include/Freeze/Map.h b/cpp/include/Freeze/Map.h
index 61cc6a66ed7..bed7f7efad4 100644
--- a/cpp/include/Freeze/Map.h
+++ b/cpp/include/Freeze/Map.h
@@ -622,34 +622,7 @@ private:
mutable bool _refValid;
};
-#if defined(_MSC_VER) && (_MSC_VER < 1300)
-//
-// Without partial template specialization
-//
-struct IceEncodingCompare
-{
- bool operator()(...)
- {
- return false;
- }
-};
-
-template<typename Compare>
-inline bool
-enableKeyCompare(const Compare&)
-{
- return true;
-}
-
-template<>
-inline bool
-enableKeyCompare<IceEncodingCompare>(const IceEncodingCompare&)
-{
- return false;
-}
-# else
struct IceEncodingCompare {};
-#endif
template<typename key_type, typename KeyCodec, typename Compare>
class KeyCompare : public KeyCompareBase
@@ -658,11 +631,7 @@ public:
KeyCompare(const Compare& mapCompare,
const Ice::CommunicatorPtr& communicator,
const Ice::EncodingVersion& encoding) :
-#if defined(_MSC_VER) && (_MSC_VER < 1300)
- KeyCompareBase(enableKeyCompare(mapCompare)),
-#else
KeyCompareBase(true),
-#endif
_compare(mapCompare),
_communicator(communicator),
_encoding(encoding)
@@ -694,7 +663,6 @@ private:
const Ice::EncodingVersion _encoding;
};
-#if !defined(_MSC_VER) || (_MSC_VER >= 1300)
//
// Partial template specialization:
// do nothing for the IceEncodingCompare comparator
@@ -713,7 +681,6 @@ public:
return 0;
}
};
-#endif
//
// Need to separate MapIndex template class because _communicator is
@@ -746,11 +713,7 @@ public:
protected:
MapIndex(const std::string& mapName, const Compare& mapCompare) :
-#if defined(_MSC_VER) && (_MSC_VER < 1300)
- MapIndexBase(mapName, enableKeyCompare(mapCompare)),
-#else
MapIndexBase(mapName, true),
-#endif
_compare(mapCompare)
{}
@@ -758,7 +721,6 @@ private:
Compare _compare;
};
-#if !defined(_MSC_VER) || (_MSC_VER >= 1300)
//
// Partial template specialization:
// do nothing for the IceEncodingCompare comparator
@@ -778,7 +740,6 @@ protected:
MapIndexBase(mapName, false)
{}
};
-#endif
//
// A sorted map, similar to a std::map, with one notable difference:
@@ -1201,36 +1162,3 @@ protected:
}
-
-//
-// This is for MSVC.
-//
-# ifdef _STLP_USE_OLD_HP_ITERATOR_QUERIES
-namespace std
-{
-
-// TODO: update.
-template <class key_type, class mapped_type, class KeyCodec, class ValueCodec, class Compare>
-inline pair<const key_type, const mapped_type>*
-value_type(const Freeze::Iterator<key_type, mapped_type, KeyCodec, ValueCodec, Compare>&)
-{
- return (pair<const key_type, const mapped_type>*)0;
-}
-
-template <class key_type, class mapped_type, class KeyCodec, class ValueCodec, class Compare>
-inline pair<const key_type, const mapped_type>*
-value_type(const Freeze::ConstIterator<key_type, mapped_type, KeyCodec, ValueCodec, Compare>&)
-{
- return (pair<const key_type, const mapped_type>*)0;
-}
-
-inline forward_iterator_tag iterator_category(const Freeze::IteratorBase&)
-{
- return forward_iterator_tag();
-}
-
-inline ptrdiff_t* distance_type(const Freeze::IteratorBase&) { return (ptrdiff_t*) 0; }
-
-}
-
-#endif
diff --git a/cpp/include/Ice/CommunicatorAsync.h b/cpp/include/Ice/CommunicatorAsync.h
index e1cd14ac7df..26915051f8d 100644
--- a/cpp/include/Ice/CommunicatorAsync.h
+++ b/cpp/include/Ice/CommunicatorAsync.h
@@ -41,11 +41,7 @@ public:
}
catch(::Ice::Exception& ex)
{
-#if defined(_MSC_VER) && (_MSC_VER < 1300) // VC++ 6 compiler bug
- __exception(__result, ex);
-#else
::IceInternal::CallbackNC<T>::__exception(__result, ex);
-#endif
return;
}
}
@@ -93,11 +89,7 @@ public:
}
catch(::Ice::Exception& ex)
{
-#if defined(_MSC_VER) && (_MSC_VER < 1300) // VC++ 6 compiler bug
- __exception(__result, ex);
-#else
::IceInternal::Callback<T, CT>::__exception(__result, ex);
-#endif
return;
}
}
diff --git a/cpp/include/Ice/ConnectionAsync.h b/cpp/include/Ice/ConnectionAsync.h
index a53fe50e002..5d850e577f4 100644
--- a/cpp/include/Ice/ConnectionAsync.h
+++ b/cpp/include/Ice/ConnectionAsync.h
@@ -41,11 +41,7 @@ public:
}
catch(::Ice::Exception& ex)
{
-#if defined(_MSC_VER) && (_MSC_VER < 1300) // VC++ 6 compiler bug
- __exception(__result, ex);
-#else
::IceInternal::CallbackNC<T>::__exception(__result, ex);
-#endif
return;
}
}
@@ -93,11 +89,7 @@ public:
}
catch(::Ice::Exception& ex)
{
-#if defined(_MSC_VER) && (_MSC_VER < 1300) // VC++ 6 compiler bug
- __exception(__result, ex);
-#else
::IceInternal::Callback<T, CT>::__exception(__result, ex);
-#endif
return;
}
}
diff --git a/cpp/include/Ice/Proxy.h b/cpp/include/Ice/Proxy.h
index ca179a1d89d..8db60bcf9ed 100644
--- a/cpp/include/Ice/Proxy.h
+++ b/cpp/include/Ice/Proxy.h
@@ -152,11 +152,6 @@ typedef IceUtil::Handle<AMI_Object_ice_flushBatchRequests> AMI_Object_ice_flushB
namespace IceProxy { namespace Ice
{
-#if defined(_MSC_VER) && (_MSC_VER == 1310)
-// Work around for VC++ 7.1 bug
-typedef ::std::map< ::std::string, ::std::string> Context;
-#endif
-
class ICE_API Object : public ::IceUtil::Shared, private ::IceUtil::Mutex
{
public:
@@ -998,33 +993,21 @@ checkedCast(const ::IceInternal::ProxyHandle<Y>& b)
{
Y* tag = 0;
Ice::Context* ctx = 0;
-#if defined(_MSC_VER) && (_MSC_VER < 1300)
- return ::IceInternal::checkedCastHelper<P::element_type>(b, tag, ctx);
-#else
return ::IceInternal::checkedCastHelper<typename P::element_type>(b, tag, ctx);
-#endif
}
template<typename P, typename Y> inline P
checkedCast(const ::IceInternal::ProxyHandle<Y>& b, const ::Ice::Context& context)
{
Y* tag = 0;
-#if defined(_MSC_VER) && (_MSC_VER < 1300)
- return ::IceInternal::checkedCastHelper<P::element_type>(b, tag, &context);
-#else
return ::IceInternal::checkedCastHelper<typename P::element_type>(b, tag, &context);
-#endif
}
template<typename P, typename Y> inline P
uncheckedCast(const ::IceInternal::ProxyHandle<Y>& b)
{
Y* tag = 0;
-#if defined(_MSC_VER) && (_MSC_VER < 1300)
- return ::IceInternal::uncheckedCastHelper<P::element_type>(b, tag);
-#else
return ::IceInternal::uncheckedCastHelper<typename P::element_type>(b, tag);
-#endif
}
template<typename P> inline P
@@ -1222,20 +1205,12 @@ public:
}
catch(const ::Ice::Exception& ex)
{
-#if defined(_MSC_VER) && (_MSC_VER < 1300) // VC++ 6 compiler bug
- __exception(result, ex);
-#else
CallbackNC<T>::__exception(result, ex);
-#endif
return;
}
if(response)
{
-#if defined(_MSC_VER) && (_MSC_VER < 1300) // VC++ 6 compiler bug
- (callback.get()->*response)();
-#else
(CallbackNC<T>::callback.get()->*response)();
-#endif
}
}
@@ -1267,20 +1242,12 @@ public:
}
catch(const ::Ice::Exception& ex)
{
-#if defined(_MSC_VER) && (_MSC_VER < 1300) // VC++ 6 compiler bug
- __exception(result, ex);
-#else
Callback<T, CT>::__exception(result, ex);
-#endif
return;
}
if(response)
{
-#if defined(_MSC_VER) && (_MSC_VER < 1300) // VC++ 6 compiler bug
- (callback.get()->*response)(CT::dynamicCast(result->getCookie()));
-#else
(Callback<T, CT>::callback.get()->*response)(CT::dynamicCast(result->getCookie()));
-#endif
}
}
@@ -1317,20 +1284,12 @@ public:
}
catch(const ::Ice::Exception& ex)
{
-#if defined(_MSC_VER) && (_MSC_VER < 1300) // VC++ 6 compiler bug
- __exception(__result, ex);
-#else
::IceInternal::CallbackNC<T>::__exception(__result, ex);
-#endif
return;
}
if(response)
{
-#if defined(_MSC_VER) && (_MSC_VER < 1300) // VC++ 6 compiler bug
- (callback.get()->*response)(__ret);
-#else
(::IceInternal::CallbackNC<T>::callback.get()->*response)(__ret);
-#endif
}
}
@@ -1362,20 +1321,12 @@ public:
}
catch(const ::Ice::Exception& ex)
{
-#if defined(_MSC_VER) && (_MSC_VER < 1300) // VC++ 6 compiler bug
- __exception(__result, ex);
-#else
::IceInternal::Callback<T, CT>::__exception(__result, ex);
-#endif
return;
}
if(response)
{
-#if defined(_MSC_VER) && (_MSC_VER < 1300) // VC++ 6 compiler bug
- (callback.get()->*response)(__ret, CT::dynamicCast(__result->getCookie()));
-#else
(::IceInternal::Callback<T, CT>::callback.get()->*response)(__ret, CT::dynamicCast(__result->getCookie()));
-#endif
}
}
@@ -1441,20 +1392,12 @@ public:
}
catch(const ::Ice::Exception& ex)
{
-#if defined(_MSC_VER) && (_MSC_VER < 1300) // VC++ 6 compiler bug
- __exception(__result, ex);
-#else
::IceInternal::CallbackNC<T>::__exception(__result, ex);
-#endif
return;
}
if(response)
{
-#if defined(_MSC_VER) && (_MSC_VER < 1300) // VC++ 6 compiler bug
- (callback.get()->*response)(__ret);
-#else
(::IceInternal::CallbackNC<T>::callback.get()->*response)(__ret);
-#endif
}
}
@@ -1486,20 +1429,12 @@ public:
}
catch(const ::Ice::Exception& ex)
{
-#if defined(_MSC_VER) && (_MSC_VER < 1300) // VC++ 6 compiler bug
- __exception(__result, ex);
-#else
::IceInternal::Callback<T, CT>::__exception(__result, ex);
-#endif
return;
}
if(response)
{
-#if defined(_MSC_VER) && (_MSC_VER < 1300) // VC++ 6 compiler bug
- (callback.get()->*response)(__ret, CT::dynamicCast(__result->getCookie()));
-#else
(::IceInternal::Callback<T, CT>::callback.get()->*response)(__ret, CT::dynamicCast(__result->getCookie()));
-#endif
}
}
@@ -1531,20 +1466,12 @@ public:
}
catch(const ::Ice::Exception& ex)
{
-#if defined(_MSC_VER) && (_MSC_VER < 1300) // VC++ 6 compiler bug
- __exception(__result, ex);
-#else
::IceInternal::CallbackNC<T>::__exception(__result, ex);
-#endif
return;
}
if(response)
{
-#if defined(_MSC_VER) && (_MSC_VER < 1300) // VC++ 6 compiler bug
- (callback.get()->*response)(__ret);
-#else
(::IceInternal::CallbackNC<T>::callback.get()->*response)(__ret);
-#endif
}
}
@@ -1576,20 +1503,12 @@ public:
}
catch(const ::Ice::Exception& ex)
{
-#if defined(_MSC_VER) && (_MSC_VER < 1300) // VC++ 6 compiler bug
- __exception(__result, ex);
-#else
::IceInternal::Callback<T, CT>::__exception(__result, ex);
-#endif
return;
}
if(response)
{
-#if defined(_MSC_VER) && (_MSC_VER < 1300) // VC++ 6 compiler bug
- (callback.get()->*response)(__ret, CT::dynamicCast(__result->getCookie()));
-#else
(::IceInternal::Callback<T, CT>::callback.get()->*response)(__ret, CT::dynamicCast(__result->getCookie()));
-#endif
}
}
@@ -1630,18 +1549,10 @@ public:
}
catch(const ::Ice::Exception& ex)
{
-#if defined(_MSC_VER) && (_MSC_VER < 1300) // VC++ 6 compiler bug
- __exception(__result, ex);
-#else
::IceInternal::CallbackNC<T>::__exception(__result, ex);
-#endif
return;
}
-#if defined(_MSC_VER) && (_MSC_VER < 1300) // VC++ 6 compiler bug
- (callback.get()->*response)(__ok, outParams);
-#else
(::IceInternal::CallbackNC<T>::callback.get()->*response)(__ok, outParams);
-#endif
return;
}
@@ -1655,18 +1566,10 @@ public:
}
catch(const ::Ice::Exception& ex)
{
-#if defined(_MSC_VER) && (_MSC_VER < 1300) // VC++ 6 compiler bug
- __exception(__result, ex);
-#else
::IceInternal::CallbackNC<T>::__exception(__result, ex);
-#endif
return;
}
-#if defined(_MSC_VER) && (_MSC_VER < 1300) // VC++ 6 compiler bug
- (callback.get()->*responseArray)(__ok, outParams);
-#else
(::IceInternal::CallbackNC<T>::callback.get()->*responseArray)(__ok, outParams);
-#endif
return;
}
}
@@ -1709,20 +1612,12 @@ public:
}
catch(const ::Ice::Exception& ex)
{
-#if defined(_MSC_VER) && (_MSC_VER < 1300) // VC++ 6 compiler bug
- __exception(__result, ex);
-#else
::IceInternal::Callback<T, CT>::__exception(__result, ex);
-#endif
return;
}
-#if defined(_MSC_VER) && (_MSC_VER < 1300) // VC++ 6 compiler bug
- (callback.get()->*response)(__ok, outParams, CT::dynamicCast(__result->getCookie()));
-#else
(::IceInternal::Callback<T, CT>::callback.get()->*response)(__ok,
outParams,
CT::dynamicCast(__result->getCookie()));
-#endif
return;
}
@@ -1736,20 +1631,12 @@ public:
}
catch(const ::Ice::Exception& ex)
{
-#if defined(_MSC_VER) && (_MSC_VER < 1300) // VC++ 6 compiler bug
- __exception(__result, ex);
-#else
::IceInternal::Callback<T, CT>::__exception(__result, ex);
-#endif
return;
}
-#if defined(_MSC_VER) && (_MSC_VER < 1300) // VC++ 6 compiler bug
- (callback.get()->*responseArray)(__ok, outParams, CT::dynamicCast(__result->getCookie()));
-#else
(::IceInternal::Callback<T, CT>::callback.get()->*responseArray)(__ok,
outParams,
CT::dynamicCast(__result->getCookie()));
-#endif
return;
}
}
diff --git a/cpp/include/IceUtil/Cache.h b/cpp/include/IceUtil/Cache.h
index 31d6e7cc460..4c698585072 100644
--- a/cpp/include/IceUtil/Cache.h
+++ b/cpp/include/IceUtil/Cache.h
@@ -168,12 +168,7 @@ template<typename Key, typename Value> bool
Cache<Key, Value>::pin(const Key& key, const Handle<Value>& obj)
{
Mutex::Lock sync(_mutex);
-#if defined(_MSC_VER) && (_MSC_VER < 1300)
- std::pair<CacheMap::iterator, bool> ir =
-#else
std::pair<typename CacheMap::iterator, bool> ir =
-#endif
-
#ifdef _MSC_VER
_map.insert(CacheMap::value_type(key, CacheValue(obj)));
#else
@@ -222,12 +217,7 @@ Cache<Key, Value>::pinImpl(const Key& key, const Handle<Value>& newObj)
latch = 0;
}
-#if defined(_MSC_VER) && (_MSC_VER < 1300)
- std::pair<CacheMap::iterator, bool> ir =
-#else
std::pair<typename CacheMap::iterator, bool> ir =
-#endif
-
#if defined(_MSC_VER)
_map.insert(CacheMap::value_type(key, CacheValue(0)));
#else
diff --git a/cpp/include/IceUtil/Config.h b/cpp/include/IceUtil/Config.h
index d6e89cdf7fe..33191fb13f6 100644
--- a/cpp/include/IceUtil/Config.h
+++ b/cpp/include/IceUtil/Config.h
@@ -77,7 +77,7 @@
# define ICE_DECLSPEC_IMPORT /**/
#endif
-#if defined(_MSC_VER) && (_MSC_VER >= 1300)
+#if defined(_MSC_VER)
# define ICE_DEPRECATED_API __declspec(deprecated)
#elif defined(__GNUC__)
# define ICE_DEPRECATED_API __attribute__((deprecated))
@@ -94,27 +94,9 @@
# define ICE_UTIL_API ICE_DECLSPEC_IMPORT
#endif
-//
-// For STLport. If we compile in debug mode, we want to use the debug
-// STLport library. This is done by setting _STLP_DEBUG before any
-// STLport header files are included.
-//
-// TODO: figure out why IceUtil does not compile with _SLTP_DEBUG using
-// the Intel compiler.
-//
-#if !defined(NDEBUG) && !defined(_STLP_DEBUG) && !defined(__INTEL_COMPILER)
-# define _STLP_DEBUG
-#endif
-
#if defined(_WIN32)
# ifndef _WIN32_WINNT
- //
- // Necessary for TryEnterCriticalSection (see IceUtil/Mutex.h).
- //
-# if defined(_MSC_VER) && _MSC_VER < 1500
-# define _WIN32_WINNT 0x0400
-# endif
# elif _WIN32_WINNT < 0x0400
# error "TryEnterCricalSection requires _WIN32_WINNT >= 0x0400"
# endif
@@ -141,13 +123,6 @@
// ...: decorated name length exceeded, name was truncated
# pragma warning( disable : 4503 )
# endif
-
- //
- // For STLport. Define _STLP_NEW_PLATFORM_SDK if a PSDK newer than the PSDK included with VC6.
- //
-# if !defined(_STLP_NEW_PLATFORM_SDK) && WINVER > 0x0400
-# define _STLP_NEW_PLATFORM_SDK 1
-# endif
#endif
//
@@ -163,13 +138,6 @@
#endif
//
-// If we use Visual C++ 6.0, we must use STLport
-//
-#if defined(_MSC_VER) && (_MSC_VER < 1300) && !defined(_STLP_BEGIN_NAMESPACE)
-# error "Ice for Visual C++ 6.0 requires STLport"
-#endif
-
-//
// By deriving from this class, other classes are made non-copyable.
//
namespace IceUtil
diff --git a/cpp/include/IceUtil/DisableWarnings.h b/cpp/include/IceUtil/DisableWarnings.h
index cf27472aa3c..e67c202d6ea 100644
--- a/cpp/include/IceUtil/DisableWarnings.h
+++ b/cpp/include/IceUtil/DisableWarnings.h
@@ -19,10 +19,7 @@
// header file in Ice *source* files!
//
-#if defined(_MSC_VER) && _MSC_VER >= 1400
+#if defined(_MSC_VER)
# define _CRT_SECURE_NO_DEPRECATE 1 // C4996 '<C function>' was declared deprecated/
-#endif
-
-#if defined(_MSC_VER) && _MSC_VER >= 1300
# pragma warning( 4 : 4996 ) // C4996 'std::<function>' was declared deprecated
#endif
diff --git a/cpp/include/IceUtil/FileUtil.h b/cpp/include/IceUtil/FileUtil.h
index 054a8c9fef0..c8973c31884 100644
--- a/cpp/include/IceUtil/FileUtil.h
+++ b/cpp/include/IceUtil/FileUtil.h
@@ -38,7 +38,7 @@ ICE_UTIL_API bool directoryExists(const std::string&);
#ifdef _WIN32
-#if defined(__MINGW32__) || (defined(_MSC_VER) && (_MSC_VER < 1300))
+#if defined(__MINGW32__)
typedef struct _stat structstat;
#else
typedef struct _stat64i32 structstat;
@@ -118,10 +118,6 @@ public:
ifstream();
ifstream(const std::string&, std::ios_base::openmode mode = std::ios_base::in);
-#ifdef _STLP_BEGIN_NAMESPACE
- ~ifstream();
- void close();
-#endif
void open(const std::string&, std::ios_base::openmode mode = std::ios_base::in);
private:
@@ -129,10 +125,6 @@ private:
// Hide const char* definitions since they shouldn't be used.
ifstream(const char*);
void open(const char*, std::ios_base::openmode mode = std::ios_base::in);
-
-#ifdef _STLP_BEGIN_NAMESPACE
- int _fd;
-#endif
};
class ICE_UTIL_API ofstream : public std::ofstream
@@ -141,10 +133,6 @@ public:
ofstream();
ofstream(const std::string&, std::ios_base::openmode mode = std::ios_base::out);
-#ifdef _STLP_BEGIN_NAMESPACE
- ~ofstream();
- void close();
-#endif
void open(const std::string&, std::ios_base::openmode mode = std::ios_base::out);
private:
@@ -152,10 +140,6 @@ private:
// Hide const char* definitions since they shouldn't be used.
ofstream(const char*);
void open(const char*, std::ios_base::openmode mode = std::ios_base::out);
-
-#ifdef _STLP_BEGIN_NAMESPACE
- int _fd;
-#endif
};
}
diff --git a/cpp/include/IceUtil/Functional.h b/cpp/include/IceUtil/Functional.h
index 6ddbd824461..3f57ae4b293 100644
--- a/cpp/include/IceUtil/Functional.h
+++ b/cpp/include/IceUtil/Functional.h
@@ -383,67 +383,3 @@ secondConstVoidMemFun1(void (T::*p)(A) const)
}
}
-
-// ----------------------------------------------------------------------
-// Extension for STLport: Special versions for bind1st and bind2nd for
-// operations that do not return anything (i.e., return void). Needed
-// for broken compilers, such as Visual C++ 6.0.
-// ----------------------------------------------------------------------
-
-#ifdef _STLP_BEGIN_NAMESPACE
-
-_STLP_BEGIN_NAMESPACE
-
-template <class _Operation>
-class voidbinder1st :
- public unary_function<typename __BINARY_ARG(_Operation,second_argument_type),
- typename __BINARY_ARG(_Operation,result_type) > {
-protected:
- _Operation _M_op;
- typename _Operation::first_argument_type _M_value;
-public:
- voidbinder1st(const _Operation& __x,
- const typename _Operation::first_argument_type& __y)
- : _M_op(__x), _M_value(__y) {}
- typename _Operation::result_type
- operator()(const typename _Operation::second_argument_type& __x) const {
- _M_op(_M_value, __x);
- }
-};
-
-template <class _Operation, class _Tp>
-inline voidbinder1st<_Operation>
-voidbind1st(const _Operation& __fn, const _Tp& __x)
-{
- typedef typename _Operation::first_argument_type _Arg1_type;
- return voidbinder1st<_Operation>(__fn, _Arg1_type(__x));
-}
-
-template <class _Operation>
-class voidbinder2nd
- : public unary_function<typename __BINARY_ARG(_Operation,first_argument_type),
- typename __BINARY_ARG(_Operation,result_type)> {
-protected:
- _Operation _M_op;
- typename _Operation::second_argument_type value;
-public:
- voidbinder2nd(const _Operation& __x,
- const typename _Operation::second_argument_type& __y)
- : _M_op(__x), value(__y) {}
- typename _Operation::result_type
- operator()(const typename _Operation::first_argument_type& __x) const {
- _M_op(__x, value);
- }
-};
-
-template <class _Operation, class _Tp>
-inline voidbinder2nd<_Operation>
-voidbind2nd(const _Operation& __fn, const _Tp& __x)
-{
- typedef typename _Operation::second_argument_type _Arg2_type;
- return voidbinder2nd<_Operation>(__fn, _Arg2_type(__x));
-}
-
-_STLP_END_NAMESPACE
-
-#endif
diff --git a/cpp/include/IceUtil/OutputUtil.h b/cpp/include/IceUtil/OutputUtil.h
index 034a4214543..85954127caf 100644
--- a/cpp/include/IceUtil/OutputUtil.h
+++ b/cpp/include/IceUtil/OutputUtil.h
@@ -134,26 +134,6 @@ operator<<(Output& out, const std::vector<T>& val)
return out;
}
-#if defined(_MSC_VER) && (_MSC_VER < 1300)
-
-//
-// Visual C++ 6.0 needs also a version of the function above with a
-// non-const vector as argument.
-//
-
-template<typename T>
-inline Output&
-operator<<(Output& out, std::vector<T>& val)
-{
- for(typename std::vector<T>::const_iterator p = val.begin(); p != val.end(); ++p)
- {
- out << *p;
- }
- return out;
-}
-
-#endif
-
template<>
inline Output&
operator<<(Output& o, const NextLine&)
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-03 17:49:40 +0000