diff options
-rw-r--r-- | ACE/ace/Logging_Strategy.cpp | 4 | ||||
-rw-r--r-- | ACE/ace/Logging_Strategy.h | 4 | ||||
-rw-r--r-- | ACE/ace/Naming_Context.cpp | 4 | ||||
-rw-r--r-- | ACE/ace/Naming_Context.h | 6 | ||||
-rw-r--r-- | ACE/ace/Stack_Trace.cpp | 4 | ||||
-rw-r--r-- | ACE/ace/Stack_Trace.h | 4 | ||||
-rw-r--r-- | TAO/TAO_IDL/be/be_interface.cpp | 20 | ||||
-rw-r--r-- | TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp | 27 |
8 files changed, 37 insertions, 36 deletions
diff --git a/ACE/ace/Logging_Strategy.cpp b/ACE/ace/Logging_Strategy.cpp index b520b0f1abb..78f5ac0acf7 100644 --- a/ACE/ace/Logging_Strategy.cpp +++ b/ACE/ace/Logging_Strategy.cpp @@ -614,8 +614,6 @@ ACE_Logging_Strategy::log_msg (ACE_Log_Msg *log_msg) this->log_msg_ = log_msg; } -ACE_END_VERSIONED_NAMESPACE_DECL - // The following is a "Factory" used by the ACE_Service_Config and // svc.conf file to dynamically initialize the state of the // Logging_Strategy. @@ -629,6 +627,8 @@ ACE_STATIC_SVC_DEFINE (ACE_Logging_Strategy, ACE_FACTORY_DEFINE (ACE, ACE_Logging_Strategy) +ACE_END_VERSIONED_NAMESPACE_DECL + // _get_dll_unload_policy() prevents ACE from being unloaded and having its // framework components run down if/when the Logging Strategy is unloaded. extern "C" ACE_Export int diff --git a/ACE/ace/Logging_Strategy.h b/ACE/ace/Logging_Strategy.h index 5ef1b7b3d04..140e3352a23 100644 --- a/ACE/ace/Logging_Strategy.h +++ b/ACE/ace/Logging_Strategy.h @@ -203,10 +203,10 @@ protected: ACE_Log_Msg *log_msg_; }; -ACE_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE_EXPORT(ACE, ACE_Logging_Strategy) ACE_FACTORY_DECLARE (ACE, ACE_Logging_Strategy) +ACE_END_VERSIONED_NAMESPACE_DECL + #endif /* ACE_LOGGING_STRATEGY_H */ diff --git a/ACE/ace/Naming_Context.cpp b/ACE/ace/Naming_Context.cpp index ddfad7f9653..52f70b31d1c 100644 --- a/ACE/ace/Naming_Context.cpp +++ b/ACE/ace/Naming_Context.cpp @@ -664,8 +664,6 @@ ACE_Name_Options::parse_args (int argc, ACE_TCHAR *argv[]) } } -ACE_END_VERSIONED_NAMESPACE_DECL - // The following Factory is used by the ACE_Service_Config and // svc.conf file to dynamically initialize the state of the Name // Server client. @@ -679,3 +677,5 @@ ACE_STATIC_SVC_DEFINE (ACE_Naming_Context, ACE_Service_Type::DELETE_OBJ, 0) ACE_STATIC_SVC_REQUIRE (ACE_Naming_Context) + +ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Naming_Context.h b/ACE/ace/Naming_Context.h index 5fded00ca4c..ec85bb6450e 100644 --- a/ACE/ace/Naming_Context.h +++ b/ACE/ace/Naming_Context.h @@ -373,14 +373,14 @@ private: ACE_Naming_Context::Context_Scope_Type context_; }; +ACE_FACTORY_DECLARE (ACE, ACE_Naming_Context) +ACE_STATIC_SVC_DECLARE_EXPORT (ACE, ACE_Naming_Context) + ACE_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) #include "ace/Naming_Context.inl" #endif /* __ACE_INLINE__ */ -ACE_FACTORY_DECLARE (ACE, ACE_Naming_Context) -ACE_STATIC_SVC_DECLARE_EXPORT (ACE, ACE_Naming_Context) - #include /**/ "ace/post.h" #endif /* ACE_NAMING_CONTEXT_H */ diff --git a/ACE/ace/Stack_Trace.cpp b/ACE/ace/Stack_Trace.cpp index 1ef021d5054..cd6f154adef 100644 --- a/ACE/ace/Stack_Trace.cpp +++ b/ACE/ace/Stack_Trace.cpp @@ -28,6 +28,8 @@ #include "ace/OS_NS_string.h" #include "ace/OS_NS_stdio.h" +ACE_BEGIN_VERSIONED_NAMESPACE_DECL + /* This is ugly, simply because it's very platform-specific. */ @@ -732,3 +734,5 @@ ACE_Stack_Trace::generate_trace (ssize_t, size_t) ACE_OS::strcpy (&this->buf_[0], UNSUPPORTED); } #endif + +ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Stack_Trace.h b/ACE/ace/Stack_Trace.h index f3f91e09e8e..14cdcc0126b 100644 --- a/ACE/ace/Stack_Trace.h +++ b/ACE/ace/Stack_Trace.h @@ -23,6 +23,8 @@ # define ACE_STACK_TRACE_SYMBUFSIZ 4096 # endif +ACE_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class ACE_Stack_Trace * @@ -100,6 +102,8 @@ private: void generate_trace (ssize_t starting_frame_offset, size_t num_frames); }; +ACE_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* ACE_STACK_TRACE_H */ diff --git a/TAO/TAO_IDL/be/be_interface.cpp b/TAO/TAO_IDL/be/be_interface.cpp index 977655765a1..7cce6542bf3 100644 --- a/TAO/TAO_IDL/be/be_interface.cpp +++ b/TAO/TAO_IDL/be/be_interface.cpp @@ -790,17 +790,15 @@ be_interface:: gen_var_out_seq_decls (void) << "class " << lname << ";" << be_nl << "typedef " << lname << " *" << lname << "_ptr;"; - *os << be_nl_2 - << "typedef" << be_idt_nl - << "TAO_Objref_Var_T<" << be_idt << be_idt_nl - << lname << be_uidt_nl - << ">" << be_uidt_nl - << lname << "_var;" << be_uidt_nl << be_nl - << "typedef" << be_idt_nl - << "TAO_Objref_Out_T<" << be_idt << be_idt_nl - << lname << be_uidt_nl - << ">" << be_uidt_nl - << lname << "_out;" << be_uidt; + *os << be_nl + << "typedef TAO_Objref_Var_T<" + << lname + << "> " + << lname << "_var;" << be_nl + << "typedef TAO_Objref_Out_T<" + << lname + << "> " + << lname << "_out;" << be_nl; os->gen_endif (); diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp index 9b9b3e041d3..fc815750ad8 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp @@ -311,24 +311,19 @@ be_visitor_sequence_ch::gen_varout_typedefs (be_sequence *node, { TAO_OutStream *os = this->ctx_->stream (); - *os << be_nl_2; + *os << be_nl; - AST_Type::SIZE_TYPE st = elem->size_type (); + AST_Type::SIZE_TYPE st = elem->size_type (); - *os << "typedef" << be_idt_nl - << (st == AST_Type::FIXED ? "::TAO_FixedSeq_Var_T<" - : "::TAO_VarSeq_Var_T<") - << be_idt << be_idt_nl - << node->local_name (); + *os << "typedef " + << (st == AST_Type::FIXED ? "::TAO_FixedSeq_Var_T<" + : "::TAO_VarSeq_Var_T<") + << node->local_name (); - *os << be_uidt_nl - << ">" << be_uidt_nl - << node->local_name () << "_var;" << be_uidt; + *os << "> " + << node->local_name () << "_var;" << be_nl; - *os << be_nl_2 - << "typedef" << be_idt_nl - << "::TAO_Seq_Out_T<" << be_idt << be_idt_nl - << node->local_name () << be_uidt_nl - << ">" << be_uidt_nl - << node->local_name () << "_out;" << be_uidt; + *os << "typedef ::TAO_Seq_Out_T<" + << node->local_name () + << "> " << node->local_name () << "_out;" << be_nl; } |