diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2002-06-04 23:35:49 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2002-06-04 23:35:49 +0000 |
| commit | e626ffe11df38ebd506ded8f3f0d26742ec84c9b (patch) | |
| tree | 4dd16aca20c4d63c26dd6c0791a4dd6081429fb1 | |
| parent | 024efb71895c115e30867bef014383e6d42553b2 (diff) | |
| download | ATCD-e626ffe11df38ebd506ded8f3f0d26742ec84c9b.tar.gz | |
ChangeLogTag:Tue Jun 04 16:34:18 2002 Ossama Othman <ossama@uci.edu>
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-02a | 12 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 12 | ||||
| -rw-r--r-- | ace/Service_Config.cpp | 3 | ||||
| -rw-r--r-- | ace/Svc_Conf_Lexer_Guard.cpp | 5 |
5 files changed, 40 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index d42e9db729b..420b890c2de 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +Tue Jun 04 16:34:18 2002 Ossama Othman <ossama@uci.edu> + + * ace/Service_Config.cpp: + + Removed duplicate "ace/Auto_Ptr.h" include. + + * ace/Svc_Conf_Lexer_Guard.cpp: + + Moved Svc_Conf.h include within the ACE_USES_CLASSIC_SVC_CONF + preprocessor block. It isn't needed for the XML-based Service + Configurator. + Tue Jun 04 16:02:11 2002 Krishnakumar B <kitty@cs.wustl.edu> * ACEXML/common/HttpCharStream.h: diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index d42e9db729b..420b890c2de 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,3 +1,15 @@ +Tue Jun 04 16:34:18 2002 Ossama Othman <ossama@uci.edu> + + * ace/Service_Config.cpp: + + Removed duplicate "ace/Auto_Ptr.h" include. + + * ace/Svc_Conf_Lexer_Guard.cpp: + + Moved Svc_Conf.h include within the ACE_USES_CLASSIC_SVC_CONF + preprocessor block. It isn't needed for the XML-based Service + Configurator. + Tue Jun 04 16:02:11 2002 Krishnakumar B <kitty@cs.wustl.edu> * ACEXML/common/HttpCharStream.h: diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index d42e9db729b..420b890c2de 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,15 @@ +Tue Jun 04 16:34:18 2002 Ossama Othman <ossama@uci.edu> + + * ace/Service_Config.cpp: + + Removed duplicate "ace/Auto_Ptr.h" include. + + * ace/Svc_Conf_Lexer_Guard.cpp: + + Moved Svc_Conf.h include within the ACE_USES_CLASSIC_SVC_CONF + preprocessor block. It isn't needed for the XML-based Service + Configurator. + Tue Jun 04 16:02:11 2002 Krishnakumar B <kitty@cs.wustl.edu> * ACEXML/common/HttpCharStream.h: diff --git a/ace/Service_Config.cpp b/ace/Service_Config.cpp index 0da87d83656..1b87a1e5941 100644 --- a/ace/Service_Config.cpp +++ b/ace/Service_Config.cpp @@ -14,7 +14,6 @@ #include "ace/Service_Config.h" #include "ace/XML_Svc_Conf.h" -#include "ace/Auto_Ptr.h" #if !defined (__ACE_INLINE__) #include "ace/Service_Config.i" @@ -24,7 +23,7 @@ ACE_RCSID (ace, Service_Config, "$Id$") -ACE_ALLOC_HOOK_DEFINE(ACE_Service_Config) +ACE_ALLOC_HOOK_DEFINE (ACE_Service_Config) void ACE_Service_Config::dump (void) const diff --git a/ace/Svc_Conf_Lexer_Guard.cpp b/ace/Svc_Conf_Lexer_Guard.cpp index 980d899d064..c5d79aa1f32 100644 --- a/ace/Svc_Conf_Lexer_Guard.cpp +++ b/ace/Svc_Conf_Lexer_Guard.cpp @@ -1,9 +1,10 @@ // -*- C++ -*- -#include "ace/Svc_Conf.h" +#include "ace/Svc_Conf_Lexer_Guard.h" #if (ACE_USES_CLASSIC_SVC_CONF == 1) -#include "ace/Svc_Conf_Lexer_Guard.h" + +#include "ace/Svc_Conf.h" ACE_RCSID (ace, Svc_Conf_Lexer_Guard, |