diff options
| author | dhinton <dhinton@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-06-25 13:38:07 +0000 |
|---|---|---|
| committer | dhinton <dhinton@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-06-25 13:38:07 +0000 |
| commit | 9b70cbbe05dd857541cb6328849e77e153c3955d (patch) | |
| tree | 140f419c46a6359cd7d356313a762132520f743e | |
| parent | 9209c6641a7b446a518a82a5b7bb3864053d7cee (diff) | |
| download | ATCD-9b70cbbe05dd857541cb6328849e77e153c3955d.tar.gz | |
ChangeLogTag:Wed Jun 25 13:36:51 UTC 2003 Don Hinton <dhinton@dresytems.com>
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | ace/Service_Object.h | 6 |
2 files changed, 10 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index 499898f933a..34817f57887 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Wed Jun 25 13:36:51 UTC 2003 Don Hinton <dhinton@dresytems.com> + + * ace/Service_Object.h: + Rolled back change from Sun Jun 22 03:27:10 UTC 2003 Don Hinton + <dhinton@dresystems.com> which made ACE_DLL member variable a + reference as part of subsetting, which caused + Service_Config_Test to fail. + Wed Jun 25 03:47:36 UTC 2003 Don Hinton <dhinton@dresystems.com> * ace/config-linux.h: diff --git a/ace/Service_Object.h b/ace/Service_Object.h index 1252abe4f8c..76349bb430d 100644 --- a/ace/Service_Object.h +++ b/ace/Service_Object.h @@ -22,8 +22,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/Event_Handler.h" - -class ACE_DLL; +#include "ace/DLL.h" #define ACE_Component ACE_Service_Object /** @@ -56,7 +55,6 @@ public: // Forward decl. class ACE_Service_Type_Impl; -class ACE_DLL; /** * @class ACE_Service_Type @@ -125,7 +123,7 @@ private: const ACE_Service_Type_Impl *type_; /// ACE_DLL representing the shared object file (non-zero if dynamically linked). - const ACE_DLL &dll_; + const ACE_DLL dll_; /// 1 if svc is currently active, otherwise 0. int active_; |