diff options
| author | Michi Henning <michi@zeroc.com> | 2009-01-28 06:54:53 +1000 |
|---|---|---|
| committer | Michi Henning <michi@zeroc.com> | 2009-01-28 06:54:53 +1000 |
| commit | d316cdad7d0a850a8a7828d5b9a7519123bbc29d (patch) | |
| tree | 17f8eafb7b547f2a45e5061821b32fc74bfaf685 /cpp/src | |
| parent | Squashed commit of the following: (diff) | |
| download | ice-d316cdad7d0a850a8a7828d5b9a7519123bbc29d.tar.bz2 ice-d316cdad7d0a850a8a7828d5b9a7519123bbc29d.tar.xz ice-d316cdad7d0a850a8a7828d5b9a7519123bbc29d.zip | |
Squashed commit of the following:
commit cf1aad9f7f2ef0df6dff5300249e2f6683a3ab66
Author: michi <michi@michi.local>
Date: Wed Jan 28 06:47:55 2009 +1000
Added test to C++ to include class with name that is a C++ keyword. The keyword tests
for the other language mappings all already contained a class named with a keyword.
commit 9dd664f3b3ac11c06936fbb5cf51bd8c2b6f87dd
Author: michi <michi@michi.local>
Date: Wed Jan 28 06:34:39 2009 +1000
Bug 3677: slice2cpp generates bad code for class named with C++ keyword
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/slice2cpp/Gen.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp index 51ea19f40d2..22a033421c6 100644 --- a/cpp/src/slice2cpp/Gen.cpp +++ b/cpp/src/slice2cpp/Gen.cpp @@ -3857,7 +3857,7 @@ Slice::Gen::ObjectVisitor::visitClassDefEnd(const ClassDefPtr& p) H << sp << nl << scoped << " _init;"; H << eb << ';'; _doneStaticSymbol = true; - H << sp << nl << "static " << scoped << "__staticInit _" << p->name() << "_init;"; + H << sp << nl << "static " << p->name() << "__staticInit _" << p->name() << "_init;"; } if(p->isLocal()) |