diff options
| author | Michi Henning <michi@zeroc.com> | 2004-06-03 01:30:22 +0000 |
|---|---|---|
| committer | Michi Henning <michi@zeroc.com> | 2004-06-03 01:30:22 +0000 |
| commit | 19eae8dcf33cf25293d5f9da6427efc3fe3a82ca (patch) | |
| tree | 63807bab93c53bc8b1b62b2f538d9225cd63a3f2 /cpp/include/IceUtil/OutputUtil.h | |
| parent | Removed the remaining traces of slice2wsdl dependencies -- they were (diff) | |
| download | ice-19eae8dcf33cf25293d5f9da6427efc3fe3a82ca.tar.bz2 ice-19eae8dcf33cf25293d5f9da6427efc3fe3a82ca.tar.xz ice-19eae8dcf33cf25293d5f9da6427efc3fe3a82ca.zip | |
Backed out previous change. Not sure why this is failing again -- it worked
previously. Seems that cleaning the project doesn't remove everything
and something goes wrong with template instantiation...
Diffstat (limited to 'cpp/include/IceUtil/OutputUtil.h')
| -rw-r--r-- | cpp/include/IceUtil/OutputUtil.h | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/cpp/include/IceUtil/OutputUtil.h b/cpp/include/IceUtil/OutputUtil.h index 0ee893b5959..3f95d2ef657 100644 --- a/cpp/include/IceUtil/OutputUtil.h +++ b/cpp/include/IceUtil/OutputUtil.h @@ -139,13 +139,13 @@ operator<<(Output& out, const std::vector<T>& val) return out; } -#if defined(_MSC_VER) +#if defined(_MSC_VER) && (_MSC_VER < 1300) -# if (_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> Output& operator<<(Output& out, std::vector<T>& val) @@ -157,24 +157,6 @@ operator<<(Output& out, std::vector<T>& val) return out; } -# else - -// -// Visual C++ 7.0 and later also need a version with an allocator. -// -template<typename T, typename A> -Output& -operator<<(Output& out, const std::vector<T, A>& val) -{ - for(typename std::vector<T, A>::const_iterator p = val.begin(); p != val.end(); ++p) - { - out << *p; - } - return out; -} - -# endif - #endif template<> |