diff options
| author | Bernard Normier <bernard@zeroc.com> | 2016-05-26 15:43:24 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2016-05-26 15:43:24 -0400 |
| commit | c474b08073c63f6b1fcffe33a5d8172702c4d1f9 (patch) | |
| tree | 11ebcd09aeb73b1587ddf2b595c447a9647a8d75 /cpp/src/slice2cpp | |
| parent | Update to latest builder and always set cppConfiguration & cppPlatform (diff) | |
| download | ice-c474b08073c63f6b1fcffe33a5d8172702c4d1f9.tar.bz2 ice-c474b08073c63f6b1fcffe33a5d8172702c4d1f9.tar.xz ice-c474b08073c63f6b1fcffe33a5d8172702c4d1f9.zip | |
Removed StreamReader/Writer explicit template
instantiations in generated code with MSVC
Diffstat (limited to 'cpp/src/slice2cpp')
| -rw-r--r-- | cpp/src/slice2cpp/Gen.cpp | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp index b78467e3415..b3998b54051 100644 --- a/cpp/src/slice2cpp/Gen.cpp +++ b/cpp/src/slice2cpp/Gen.cpp @@ -4873,30 +4873,6 @@ Slice::Gen::StreamVisitor::visitStructStart(const StructPtr& p) } H << eb; H << eb << ";" << nl; - - if(!_dllExport.empty()) - { - // - // We tell "importers" that the implementation exports these instantiations - // - H << nl << "#if defined(ICE_HAS_DECLSPEC_IMPORT_EXPORT) && !defined("; - H << _dllExport.substr(0, _dllExport.size() - 1) + "_EXPORTS) && !defined(ICE_STATIC_LIBS)"; - H << nl << "template struct " << _dllExport << "StreamWriter< " << fullStructName - << ", ::Ice::OutputStream>;"; - H << nl << "template struct " << _dllExport << "StreamReader< " << fullStructName - << ", ::Ice::InputStream>;"; - H << nl << "#endif" << nl; - - // - // The instantations: - // - C << nl << "#if defined(ICE_HAS_DECLSPEC_IMPORT_EXPORT) && !defined(ICE_STATIC_LIBS)"; - C << nl << "template struct " << _dllExport << "StreamWriter< " << fullStructName - << ", ::Ice::OutputStream>;"; - C << nl << "template struct " << _dllExport << "StreamReader< " << fullStructName - << ", ::Ice::InputStream>;"; - C << nl << "#endif"; - } } return false; } @@ -7906,25 +7882,6 @@ Slice::Gen::Cpp11StreamVisitor::visitStructStart(const StructPtr& p) H << eb; H << eb << ";" << nl; - if(!_dllExport.empty()) - { - // - // We tell "importers" that the implementation exports these instantiations - // - H << nl << "#if defined(ICE_HAS_DECLSPEC_IMPORT_EXPORT) && !defined("; - H << _dllExport.substr(0, _dllExport.size() - 1) + "_EXPORTS) && !defined(ICE_STATIC_LIBS)"; - H << nl << "template struct " << _dllExport << "StreamWriter< " << scoped << ", ::Ice::OutputStream>;"; - H << nl << "template struct " << _dllExport << "StreamReader< " << scoped << ", ::Ice::InputStream>;"; - H << nl << "#endif" << nl; - - // - // The instantations: - // - C << nl << "#if defined(ICE_HAS_DECLSPEC_IMPORT_EXPORT) && !defined(ICE_STATIC_LIBS)"; - C << nl << "template struct " << _dllExport << "StreamWriter< " << scoped << ", ::Ice::OutputStream>;"; - C << nl << "template struct " << _dllExport << "StreamReader< " << scoped << ", ::Ice::InputStream>;"; - C << nl << "#endif"; - } return false; } |