diff options
author | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-05-09 21:39:52 +0000 |
---|---|---|
committer | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-05-09 21:39:52 +0000 |
commit | 4e25939091e551f67d26020c129bb50d0afff369 (patch) | |
tree | 2a2ed53e8af5b0b7fdf73a67b93f2a4a88f5459c | |
parent | db691ae5101d46fda57fa871e0fbcca0532e3b9d (diff) | |
download | ATCD-4e25939091e551f67d26020c129bb50d0afff369.tar.gz |
ChangeLogTag:Thu May 9 16:26:48 2002 Nanbor Wang <nanbor@cs.wustl.edu>
-rw-r--r-- | ACEXML/examples/SAXPrint/main.cpp | 3 | ||||
-rw-r--r-- | ChangeLog | 11 | ||||
-rw-r--r-- | ChangeLogs/ChangeLog-02a | 11 | ||||
-rw-r--r-- | ChangeLogs/ChangeLog-03a | 11 | ||||
-rw-r--r-- | ace/Service_Config.cpp | 13 | ||||
-rw-r--r-- | ace/Service_Config.h | 2 | ||||
-rw-r--r-- | ace/Svc_Conf.y | 50 | ||||
-rw-r--r-- | ace/Svc_Conf_y.cpp | 51 |
8 files changed, 53 insertions, 99 deletions
diff --git a/ACEXML/examples/SAXPrint/main.cpp b/ACEXML/examples/SAXPrint/main.cpp index 86bf8ed86c5..9f01f522f3a 100644 --- a/ACEXML/examples/SAXPrint/main.cpp +++ b/ACEXML/examples/SAXPrint/main.cpp @@ -1,6 +1,7 @@ // $Id$ #include "ACEXML/common/FileCharStream.h" +#include "ACEXML/common/StrCharStream.h" #include "ACEXML/parser/parser/Parser.h" #include "ACEXML/parser/parser/Parser.h" #include "Print_Handler.h" @@ -69,7 +70,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { ACE_NEW_RETURN (stm, ACEXML_StrCharStream (test_string), - 1); + -1); } if (sax == 0) diff --git a/ChangeLog b/ChangeLog index c59038c430f..8638d9b7e2b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +Thu May 9 16:26:48 2002 Nanbor Wang <nanbor@cs.wustl.edu> + + * ACEXML/examples/SAXPrint/main.cpp: Added missing include file. + + * ace/Service_Config.cpp: + * ace/Service_Config.h: + * ace/Svc_Conf.y: + * ace/Svc_Conf_y.cpp: Consolidated ace_create_service_type into + ACE_Service_Config::create_service_type_impl. + + Thu May 9 14:35:24 2002 Nanbor Wang <nanbor@cs.wustl.edu> * ace/XML_Svc_Conf.h: Changed to include ACE_export.h instead of diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index c59038c430f..8638d9b7e2b 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,3 +1,14 @@ +Thu May 9 16:26:48 2002 Nanbor Wang <nanbor@cs.wustl.edu> + + * ACEXML/examples/SAXPrint/main.cpp: Added missing include file. + + * ace/Service_Config.cpp: + * ace/Service_Config.h: + * ace/Svc_Conf.y: + * ace/Svc_Conf_y.cpp: Consolidated ace_create_service_type into + ACE_Service_Config::create_service_type_impl. + + Thu May 9 14:35:24 2002 Nanbor Wang <nanbor@cs.wustl.edu> * ace/XML_Svc_Conf.h: Changed to include ACE_export.h instead of diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index c59038c430f..8638d9b7e2b 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,14 @@ +Thu May 9 16:26:48 2002 Nanbor Wang <nanbor@cs.wustl.edu> + + * ACEXML/examples/SAXPrint/main.cpp: Added missing include file. + + * ace/Service_Config.cpp: + * ace/Service_Config.h: + * ace/Svc_Conf.y: + * ace/Svc_Conf_y.cpp: Consolidated ace_create_service_type into + ACE_Service_Config::create_service_type_impl. + + Thu May 9 14:35:24 2002 Nanbor Wang <nanbor@cs.wustl.edu> * ace/XML_Svc_Conf.h: Changed to include ACE_export.h instead of diff --git a/ace/Service_Config.cpp b/ace/Service_Config.cpp index 72e982f5ebe..7b75c157aa3 100644 --- a/ace/Service_Config.cpp +++ b/ace/Service_Config.cpp @@ -240,6 +240,7 @@ ACE_Service_Config::create_service_type (const ACE_TCHAR *n, 0); return sp; } +#endif /* ACE_USES_CLASSIC_SVC_CONF == 0 */ ACE_Service_Type_Impl * ACE_Service_Config::create_service_type_impl (const ACE_TCHAR *name, @@ -281,7 +282,7 @@ ACE_Service_Config::create_service_type_impl (const ACE_TCHAR *name, return stp; } -#endif /* ACE_USES_CLASSIC_SVC_CONF == 0 */ + // Initialize and activate a statically linked service. int @@ -568,11 +569,11 @@ ACE_Service_Config::process_directive (const ACE_Static_Svc_Descriptor &ssd, void *sym = (ssd.alloc_)(&gobbler); ACE_Service_Type_Impl *stp = - ace_create_service_type (ssd.name_, - ssd.type_, - sym, - ssd.flags_, - gobbler); + ACE_Service_Config::create_service_type_impl (ssd.name_, + ssd.type_, + sym, + ssd.flags_, + gobbler); if (stp == 0) return 0; diff --git a/ace/Service_Config.h b/ace/Service_Config.h index 2b8da8c37b9..de136e1feda 100644 --- a/ace/Service_Config.h +++ b/ace/Service_Config.h @@ -358,13 +358,13 @@ public: ACE_Service_Type_Impl *o, const ACE_SHLIB_HANDLE handle, int active); +#endif /* ACE_USES_CLASSIC_SVC_CONF == 0 */ static ACE_Service_Type_Impl *create_service_type_impl (const ACE_TCHAR *name, int type, void *symbol, u_int flags, ACE_Service_Object_Exterminator gobbler); -#endif /* ACE_USES_CLASSIC_SVC_CONF == 0 */ protected: /// Process service configuration requests that were provided on the /// command-line. Returns the number of errors that occurred. diff --git a/ace/Svc_Conf.y b/ace/Svc_Conf.y index dfb44e6fc7e..59d0eeae69b 100644 --- a/ace/Svc_Conf.y +++ b/ace/Svc_Conf.y @@ -239,11 +239,11 @@ svc_location if (sym != 0) { ACE_Service_Type_Impl *stp - = ace_create_service_type ($1, - $2, - sym, - flags, - gobbler); + = ACE_Service_Config::create_service_type_impl ($1, + $2, + sym, + flags, + gobbler); if (stp == 0) ace_yyerrno++; @@ -403,46 +403,6 @@ ace_get_module (ACE_Static_Node *str_rec, return mt; } -ACE_Service_Type_Impl * -ace_create_service_type (const ACE_TCHAR *name, - int type, - void *symbol, - u_int flags, - ACE_Service_Object_Exterminator gobbler) -{ - ACE_Service_Type_Impl *stp = 0; - - // Note, the only place we need to put a case statement. This is - // also the place where we'd put the RTTI tests, if the compiler - // actually supported them! - - switch (type) - { - case ACE_SVC_OBJ_T: - ACE_NEW_RETURN (stp, - ACE_Service_Object_Type ((ACE_Service_Object *) symbol, - name, flags, - gobbler), - 0); - break; - case ACE_MODULE_T: - ACE_NEW_RETURN (stp, - ACE_Module_Type (symbol, name, flags), - 0); - break; - case ACE_STREAM_T: - ACE_NEW_RETURN (stp, - ACE_Stream_Type (symbol, name, flags), - 0); - break; - default: - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("unknown case\n"))); - break; - } - return stp; -} - #if defined (DEBUGGING) // Current line number. int yylineno = 1; diff --git a/ace/Svc_Conf_y.cpp b/ace/Svc_Conf_y.cpp index 3ec20415303..2e590457d84 100644 --- a/ace/Svc_Conf_y.cpp +++ b/ace/Svc_Conf_y.cpp @@ -970,11 +970,11 @@ case 30: if (sym != 0) { ACE_Service_Type_Impl *stp - = ace_create_service_type (ace_yyvsp[-3].ident_, - ace_yyvsp[-2].type_, - sym, - flags, - gobbler); + = ACE_Service_Config::create_service_type_impl (ace_yyvsp[-3].ident_, + ace_yyvsp[-2].type_, + sym, + flags, + gobbler); ace_yyval.svc_record_ = new ACE_Service_Type (ace_yyvsp[-3].ident_, stp, ace_yyvsp[-1].location_node_->handle (), @@ -1343,47 +1343,6 @@ ace_get_module (ACE_Static_Node *str_rec, return mt; } -ACE_Service_Type_Impl * -ace_create_service_type (const ACE_TCHAR *name, - int type, - void *symbol, - u_int flags, - ACE_Service_Object_Exterminator gobbler) -{ - ACE_Service_Type_Impl *stp = 0; - - // Note, the only place we need to put a case statement. This is - // also the place where we'd put the RTTI tests, if the compiler - // actually supported them! - - switch (type) - { - case ACE_SVC_OBJ_T: - ACE_NEW_RETURN (stp, - ACE_Service_Object_Type ((ACE_Service_Object *) symbol, - name, flags, - gobbler), - 0); - break; - case ACE_MODULE_T: - ACE_NEW_RETURN (stp, - ACE_Module_Type (symbol, name, flags), - 0); - break; - case ACE_STREAM_T: - ACE_NEW_RETURN (stp, - ACE_Stream_Type (symbol, name, flags), - 0); - break; - default: - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("unknown case\n"))); - ace_yyerrno++; - break; - } - return stp; -} - #if defined (DEBUGGING) // Current line number. int ace_yylineno = 1; |