diff options
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/include/IceUtil/Config.h | 7 | ||||
| -rw-r--r-- | cpp/include/IceUtil/Functional.h | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/cpp/include/IceUtil/Config.h b/cpp/include/IceUtil/Config.h index fb0f6f96a19..0025b723915 100644 --- a/cpp/include/IceUtil/Config.h +++ b/cpp/include/IceUtil/Config.h @@ -149,6 +149,13 @@ #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/Functional.h b/cpp/include/IceUtil/Functional.h index 383265ea876..44156112fb7 100644 --- a/cpp/include/IceUtil/Functional.h +++ b/cpp/include/IceUtil/Functional.h @@ -388,7 +388,7 @@ 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++ +// for broken compilers, such as Visual C++ 6.0. // ---------------------------------------------------------------------- #ifdef _STLP_BEGIN_NAMESPACE |