diff options
| author | ZeroC Staff <git@zeroc.com> | 2003-05-27 16:19:16 +0000 |
|---|---|---|
| committer | ZeroC Staff <git@zeroc.com> | 2003-05-27 16:19:16 +0000 |
| commit | 077962cdcfc2894e30e68ebc7ffe6d22b4355856 (patch) | |
| tree | 670eddb5c2713c3013ecfa5bed94dc675f2ff354 | |
| parent | This modification gets rid of the Uninitialized Memory Read that Purify was (diff) | |
| download | ice-077962cdcfc2894e30e68ebc7ffe6d22b4355856.tar.bz2 ice-077962cdcfc2894e30e68ebc7ffe6d22b4355856.tar.xz ice-077962cdcfc2894e30e68ebc7ffe6d22b4355856.zip | |
Need dummy data member in Ice::Application for CC5.5 as well.
| -rw-r--r-- | cpp/include/Ice/Application.h | 4 | ||||
| -rw-r--r-- | cpp/test/Ice/adapterDeactivation/Client.cpp | 10 | ||||
| -rw-r--r-- | cpp/test/Ice/adapterDeactivation/Collocated.cpp | 9 | ||||
| -rw-r--r-- | cpp/test/Ice/adapterDeactivation/Server.cpp | 9 |
4 files changed, 2 insertions, 30 deletions
diff --git a/cpp/include/Ice/Application.h b/cpp/include/Ice/Application.h index d47117cc3c0..b127418b065 100644 --- a/cpp/include/Ice/Application.h +++ b/cpp/include/Ice/Application.h @@ -84,9 +84,9 @@ public: static bool interrupted(); -#if defined(__SUNPRO_CC) && (__SUNPRO_CC==0x530) +#if defined(__SUNPRO_CC) && ((__SUNPRO_CC==0x530) || (__SUNPRO_CC==0x550)) // -// Sun C++ 5.3 does not like classes with no data members +// Sun C++ 5.3/5.5 does not like classes with no data members // private: char _dummy; diff --git a/cpp/test/Ice/adapterDeactivation/Client.cpp b/cpp/test/Ice/adapterDeactivation/Client.cpp index fbdc0f940c0..114fc7054e2 100644 --- a/cpp/test/Ice/adapterDeactivation/Client.cpp +++ b/cpp/test/Ice/adapterDeactivation/Client.cpp @@ -24,16 +24,6 @@ class TestClient : public Application public: virtual int run(int, char*[]); - -#if defined(__SUNPRO_CC) && (__SUNPRO_CC==0x550) -// -// Sun C++ 5.5 needs a dummy data member here. -// -private: - char _dummy; -#endif - - }; int diff --git a/cpp/test/Ice/adapterDeactivation/Collocated.cpp b/cpp/test/Ice/adapterDeactivation/Collocated.cpp index b18e1387736..0039bec0116 100644 --- a/cpp/test/Ice/adapterDeactivation/Collocated.cpp +++ b/cpp/test/Ice/adapterDeactivation/Collocated.cpp @@ -25,15 +25,6 @@ class TestServer : public Application public: virtual int run(int, char*[]); - -#if defined(__SUNPRO_CC) && (__SUNPRO_CC==0x550) -// -// Sun C++ 5.5 needs a dummy data member here. -// -private: - char _dummy; -#endif - }; int diff --git a/cpp/test/Ice/adapterDeactivation/Server.cpp b/cpp/test/Ice/adapterDeactivation/Server.cpp index acd20154df6..37f0630bc22 100644 --- a/cpp/test/Ice/adapterDeactivation/Server.cpp +++ b/cpp/test/Ice/adapterDeactivation/Server.cpp @@ -24,15 +24,6 @@ class TestServer : public Application public: virtual int run(int, char*[]); - -#if defined(__SUNPRO_CC) && (__SUNPRO_CC==0x550) -// -// Sun C++ 5.5 needs a dummy data member here. -// -private: - char _dummy; -#endif - }; int |