diff options
| author | Bernard Normier <bernard@zeroc.com> | 2010-05-13 11:50:03 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2010-05-13 11:50:03 -0400 |
| commit | 700eed3207129c277c245fec9fdebfa099a0f77e (patch) | |
| tree | 16dc801d327c8c9e27066f007745a09d73dbb8c0 /cpp/src/FreezeScript/TransformVisitor.cpp | |
| parent | bug 4725 - generate one shot constructor for structs (diff) | |
| download | ice-700eed3207129c277c245fec9fdebfa099a0f77e.tar.bz2 ice-700eed3207129c277c245fec9fdebfa099a0f77e.tar.xz ice-700eed3207129c277c245fec9fdebfa099a0f77e.zip | |
Squashed commit of the following:
commit f25399b006e5b15b46e4258546d80e1d006e1bc1
Author: U-bwin7\bernard <bernard@bwin7.(none)>
Date: Thu May 13 11:41:01 2010 -0400
VS2010 port
Diffstat (limited to 'cpp/src/FreezeScript/TransformVisitor.cpp')
| -rwxr-xr-x[-rw-r--r--] | cpp/src/FreezeScript/TransformVisitor.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/cpp/src/FreezeScript/TransformVisitor.cpp b/cpp/src/FreezeScript/TransformVisitor.cpp index e0ba143e66b..ad47f9ca2a8 100644..100755 --- a/cpp/src/FreezeScript/TransformVisitor.cpp +++ b/cpp/src/FreezeScript/TransformVisitor.cpp @@ -527,7 +527,12 @@ FreezeScript::TransformVisitor::transformObject(const ObjectDataPtr& dest, const catch(...) { objectDataMap.erase(p); + +#if (defined(_MSC_VER) && (_MSC_VER >= 1600)) + objectDataMap.insert(ObjectDataMap::value_type(src.get(), nullptr)); +#else objectDataMap.insert(ObjectDataMap::value_type(src.get(), 0)); +#endif throw; } } |