diff options
| author | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-10-29 04:37:26 +0000 |
|---|---|---|
| committer | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-10-29 04:37:26 +0000 |
| commit | 40324e31e02f93f31135f68e2cb72e8570c3959b (patch) | |
| tree | 95d69b14636ab25ade15bdd7fd2ba5a50d345c8a /ace/Object_Manager.h | |
| parent | 83050cd6471b82c39effb5b1bcecc6dafed38daf (diff) | |
| download | ATCD-40324e31e02f93f31135f68e2cb72e8570c3959b.tar.gz | |
declare the ACE_Object_Manager_Base methods to be public, instead of
protected, for DEC CXX 5.6
Diffstat (limited to 'ace/Object_Manager.h')
| -rw-r--r-- | ace/Object_Manager.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/ace/Object_Manager.h b/ace/Object_Manager.h index b47274e39b6..81a29c7b6e9 100644 --- a/ace/Object_Manager.h +++ b/ace/Object_Manager.h @@ -61,13 +61,15 @@ class ACE_Export ACE_Object_Manager_Base // // = DESCRIPTION // Encapsulates the most useful ACE_Object_Manager data structures. -# if defined (ACE_PSOS) && defined (__DIAB) -// the Diab compiler got confused and complained about access rights -// if this section was protected (changing this to public makes it happy) +# if (defined (ACE_PSOS) && defined (__DIAB)) || \ + (defined (__DECCXX_VER) && __DECCXX_VER < 60000000) + // The Diab compiler got confused and complained about access rights + // if this section was protected (changing this to public makes it happy). + // Similarly, DEC CXX 5.6 needs the methods to be public. public: -# else /* ! defined (ACE_PSOS) && defined (__DIAB) */ +# else /* ! (ACE_PSOS && __DIAB) || ! __DECCXX_VER < 60000000 */ protected: -# endif /* ! defined (ACE_PSOS) && defined (__DIAB) */ +# endif /* ! (ACE_PSOS && __DIAB) || ! __DECCXX_VER < 60000000 */ ACE_Object_Manager_Base (void); // Default constructor. |