diff options
| author | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-07-12 19:44:54 +0000 |
|---|---|---|
| committer | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-07-12 19:44:54 +0000 |
| commit | 0a953f30b61257b61c2bc52c048baab336d6386f (patch) | |
| tree | a488a4837ced921fea9af71b82831228a85b04fc | |
| parent | 0d0b6d37ea7a30975252105a180100d019598a63 (diff) | |
| download | ATCD-0a953f30b61257b61c2bc52c048baab336d6386f.tar.gz | |
ChangeLogTag: Mon Jul 12 14:41:14 1999 David L. Levine <levine@cs.wustl.edu>
| -rw-r--r-- | ChangeLog-99b | 6 | ||||
| -rw-r--r-- | ace/Object_Manager.h | 6 | ||||
| -rw-r--r-- | ace/config-win32.h | 8 |
3 files changed, 15 insertions, 5 deletions
diff --git a/ChangeLog-99b b/ChangeLog-99b index d4cf71c180b..8757516118a 100644 --- a/ChangeLog-99b +++ b/ChangeLog-99b @@ -1,3 +1,9 @@ +Mon Jul 12 14:41:14 1999 David L. Levine <levine@cs.wustl.edu> + + * ace/config-win32.h,Object_Manager.h: cleaned up comments + about the non-static ACE_Object_Manager. Thanks to + John Morey <jmorey@tbi.com> for reporting this. + Mon Jul 12 13:54:34 1999 Kirthika Parameswaran <kirthika@cs.wustl.edu> Mon Jul 12 12:14:45 1999 David L. Levine <levine@cs.wustl.edu> diff --git a/ace/Object_Manager.h b/ace/Object_Manager.h index cacc50b5faa..e7aa124cc19 100644 --- a/ace/Object_Manager.h +++ b/ace/Object_Manager.h @@ -176,8 +176,10 @@ class ACE_Export ACE_Object_Manager : public ACE_Object_Manager_Base // Instead of creating a static ACE_Object_Manager, or creating // it on the stack of main (), another alternative is to #define // ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER. With that - // #define, the application _must_ call ACE::init () at the - // start of the program, and call ACE::fini () at the end. + // #define, the application must create the ACE_Object_Manager. + // The recommended way is to call ACE::init () at the start of the + // program, and call ACE::fini () at the end. Alternatively, the + // application could explicity construct an ACE_Object_Manager. public: virtual int init (void); diff --git a/ace/config-win32.h b/ace/config-win32.h index 955d42a2061..43cfa8b5d14 100644 --- a/ace/config-win32.h +++ b/ace/config-win32.h @@ -169,13 +169,15 @@ // does not suit your need, you can disable the behavior by defining // ACE_HAS_NONSTATIC_OBJECT_MANAGER to 0. // -// MFC users: Since the main function is defined withing MFC library, -// you'll need to instantiate the ACE_Object_Manager by doing either, +// MFC users: the main function is defined withing MFC library. +// Therefore, you'll need to instantiate the ACE_Object_Manager by +// either: // -// 1. Using static object manager (as described above.) +// 1. Using static object manager (as described above). // 2. Instantiate Object Manager in your CApplication derived class // and define ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER. // +// #if !defined (ACE_HAS_NONSTATIC_OBJECT_MANAGER) # define ACE_HAS_NONSTATIC_OBJECT_MANAGER #elif (ACE_HAS_NONSTATIC_OBJECT_MANAGER == 0) |