diff options
| author | Bernard Normier <bernard@zeroc.com> | 2012-09-07 11:19:34 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2012-09-07 11:19:34 -0400 |
| commit | c9c426efd3e579d0220fbdee4a0a261fa2c191b5 (patch) | |
| tree | d67c6356bfda2700e983586afaa71f28734c2cc9 /cpp/src/slice2freezej/Main.cpp | |
| parent | Undo pragma-once-in-header enhancement (diff) | |
| download | ice-c9c426efd3e579d0220fbdee4a0a261fa2c191b5.tar.bz2 ice-c9c426efd3e579d0220fbdee4a0a261fa2c191b5.tar.xz ice-c9c426efd3e579d0220fbdee4a0a261fa2c191b5.zip | |
Port to Solaris 11 / Solaris Studio 12.3 (== CC 5.12)
Fix to BasicStream.h (unitialized data member) that caused occasional failures in Ice/stream test
Diffstat (limited to 'cpp/src/slice2freezej/Main.cpp')
| -rwxr-xr-x | cpp/src/slice2freezej/Main.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/cpp/src/slice2freezej/Main.cpp b/cpp/src/slice2freezej/Main.cpp index a08642d2650..ff267b46e99 100755 --- a/cpp/src/slice2freezej/Main.cpp +++ b/cpp/src/slice2freezej/Main.cpp @@ -100,7 +100,13 @@ public: void generate(UnitPtr&, const Index&); +#ifdef __SUNPRO_CC +protected: + using JavaGenerator::typeToObjectString; +#endif + private: + string typeToObjectString(const TypePtr&); string varToObject(const TypePtr&, const string&); string objectToVar(const TypePtr&, const string&); |