diff options
| author | Jose <jose@zeroc.com> | 2009-11-16 20:06:30 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2009-11-16 20:06:30 +0100 |
| commit | 6046b5f2d04d8636b40e093e4c81f6e1936b221d (patch) | |
| tree | f11b2cf346b0517481bf4240f36883baac85d2c8 /cpp | |
| parent | More Windows build changes (diff) | |
| download | ice-6046b5f2d04d8636b40e093e4c81f6e1936b221d.tar.bz2 ice-6046b5f2d04d8636b40e093e4c81f6e1936b221d.tar.xz ice-6046b5f2d04d8636b40e093e4c81f6e1936b221d.zip | |
4363 - test/Ice/stream fails on Windows x64/VC90
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/include/Ice/Stream.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/cpp/include/Ice/Stream.h b/cpp/include/Ice/Stream.h index 48c006fcb43..658aee69cd2 100644 --- a/cpp/include/Ice/Stream.h +++ b/cpp/include/Ice/Stream.h @@ -237,8 +237,15 @@ public: // inline void #if defined(_MSC_VER) && (_MSC_VER >= 1300) - // std::vector<bool> optimization for Vs2008 - read(std::_Vb_reference<unsigned int, __w64 int, std::vector<bool, std::allocator<bool> > > v) + +#if defined (ICE_64) + // std::vector<bool> optimization for Vs2008 x64 + read(std::_Vb_reference<unsigned __int64, __int64, std::vector<bool, std::allocator<bool> > > v) +#else + // std::vector<bool> optimization for Vs2008 x86 + read(std::_Vb_reference<unsigned int, int, std::vector<bool, std::allocator<bool> > > v) +#endif + #elif defined(__BCPLUSPLUS__) // std::vector<bool> optimization for Borland. read(std::_Vb_reference<unsigned int, int> v) |