diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-04-19 11:38:50 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-04-19 11:38:50 +0000 |
| commit | 85b06f5a2041cf5b3a4b959ca0df88e7129561f1 (patch) | |
| tree | dc4500e495d97a4c4a287bf53b41c7d5f5112ef0 /TAO/tao/default_resource.cpp | |
| parent | 672dfd3b014dd7e8e62625b9887a8ea8d8d2b0ca (diff) | |
| download | ATCD-85b06f5a2041cf5b3a4b959ca0df88e7129561f1.tar.gz | |
ChangeLogTag: Wed Apr 19 11:23:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'TAO/tao/default_resource.cpp')
| -rw-r--r-- | TAO/tao/default_resource.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/TAO/tao/default_resource.cpp b/TAO/tao/default_resource.cpp index 59f2cd93332..b53e516d9ac 100644 --- a/TAO/tao/default_resource.cpp +++ b/TAO/tao/default_resource.cpp @@ -4,6 +4,7 @@ #include "tao/debug.h" #include "tao/IIOP_Factory.h" +#include "tao/Protocol_Factory.h" #include "tao/Acceptor_Registry.h" #include "tao/Connector_Registry.h" #include "tao/Reactive_Flushing_Strategy.h" @@ -25,7 +26,6 @@ #include "ace/OS_NS_string.h" #include "ace/OS_NS_strings.h" - ACE_RCSID (tao, default_resource, "$Id$") @@ -546,6 +546,7 @@ TAO_Default_Resource_Factory::add_to_ior_parser_names (const char *curarg) int TAO_Default_Resource_Factory::load_default_protocols (void) { +#if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0) // If the user did not list any protocols in her svc.conf file // then default to TAO's basic protocols. // You do *NOT* need modify this code to add your own protocol, @@ -581,7 +582,7 @@ TAO_Default_Resource_Factory::load_default_protocols (void) // If a protocol factory is obtained from the Service // Configurator then do not transfer ownership to the // TAO_Protocol_Item. - int transfer_ownership = 0; + bool transfer_ownership = false; protocol_factory = ACE_Dynamic_Service<TAO_Protocol_Factory>::instance ("IIOP_Factory"); @@ -604,11 +605,12 @@ TAO_Default_Resource_Factory::load_default_protocols (void) protocol_factory, TAO_Protocol_Factory); - transfer_ownership = 1; + transfer_ownership = true; + } else { - transfer_ownership = 0; + transfer_ownership = false; } ACE_NEW_RETURN (item, @@ -648,6 +650,8 @@ TAO_Default_Resource_Factory::load_default_protocols (void) ACE_TEXT ("protocol <IIOP_Factory>\n"))); } +#endif /* TAO_HAS_IIOP && TAO_HAS_IIOP != 0 */ + return 0; } |