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/Transformer.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/Transformer.cpp')
| -rwxr-xr-x[-rw-r--r--] | cpp/src/FreezeScript/Transformer.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/cpp/src/FreezeScript/Transformer.cpp b/cpp/src/FreezeScript/Transformer.cpp index adb1601c5de..b509c1a0045 100644..100755 --- a/cpp/src/FreezeScript/Transformer.cpp +++ b/cpp/src/FreezeScript/Transformer.cpp @@ -2649,7 +2649,11 @@ FreezeScript::ObjectVisitor::visitObject(const ObjectRefPtr& data) ObjectDataMap::iterator p = _map.find(value.get()); if(p == _map.end()) { - _map.insert(ObjectDataMap::value_type(value.get(), 0)); +#if (defined(_MSC_VER) && (_MSC_VER >= 1600)) + _map.insert(ObjectDataMap::value_type(value.get(), nullptr)); +#else + _map.insert(ObjectDataMap::value_type(value.get(), 0)); +#endif DataMemberMap& members = value->getMembers(); for(DataMemberMap::iterator q = members.begin(); q != members.end(); ++q) { |