diff options
| author | Bernard Normier <bernard@zeroc.com> | 2016-07-13 12:06:46 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2016-07-13 12:06:46 -0400 |
| commit | 30004443d55d6597f9695bfcf54a6771bc296501 (patch) | |
| tree | 7e79568abd26300ef974ca22c6916044af1cb569 /cpp/src/slice2cpp/Gen.cpp | |
| parent | Fixed for 7213 - Added check for VC120 to add PATH for Bzip2 library (diff) | |
| download | ice-30004443d55d6597f9695bfcf54a6771bc296501.tar.bz2 ice-30004443d55d6597f9695bfcf54a6771bc296501.tar.xz ice-30004443d55d6597f9695bfcf54a6771bc296501.zip | |
Various C++ cleanups
Diffstat (limited to 'cpp/src/slice2cpp/Gen.cpp')
| -rw-r--r-- | cpp/src/slice2cpp/Gen.cpp | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp index e7fe5c368bb..f0e3453e41a 100644 --- a/cpp/src/slice2cpp/Gen.cpp +++ b/cpp/src/slice2cpp/Gen.cpp @@ -6717,14 +6717,6 @@ Slice::Gen::Cpp11LocalObjectVisitor::visitClassDefStart(const ClassDefPtr& p) H.inc(); // - // In C++, a nested type cannot have the same name as the enclosing type - // - if(p->name() != "PointerType") - { - H << nl << "using PointerType = ::std::shared_ptr<" << name << ">;"; - } - - // // Out of line virtual dtor to avoid weak vtable // H << sp << nl << _dllMemberExport << "virtual ~" << name << "();"; @@ -7614,15 +7606,6 @@ Slice::Gen::Cpp11ValueVisitor::visitClassDefStart(const ClassDefPtr& p) H << nl << "public:" << sp; H.inc(); - // - // In C++, a nested type cannot have the same name as the enclosing type - // - - if(p->name() != "PointerType") - { - H << nl << "using PointerType = ::std::shared_ptr<" << name << ">;"; - } - // Out of line dtor to avoid weak vtable H << sp; H << nl << _dllMemberExport << "virtual ~" << name << "();"; |