summaryrefslogtreecommitdiff
path: root/cpp/include/IceUtil
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/include/IceUtil')
-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
6 files changed, 3 insertions, 148 deletions
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 19:22:24 +0000