summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2006-07-03 09:23:43 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2006-07-03 09:23:43 +0000
commit81f76cb532a658a7a800e939c8bdecf338e96349 (patch)
treebedc027977d30c2bde05cd43394b3cdb6ac792f7
parenta9e2187f52e4a9ed830549aa827eebfd18d6c6cf (diff)
downloadATCD-81f76cb532a658a7a800e939c8bdecf338e96349.tar.gz
*** empty log message ***
-rw-r--r--TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp2
-rw-r--r--TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp5
-rw-r--r--TAO/TAO_IDL/be/be_visitor_typecode/alias_typecode.cpp4
-rw-r--r--TAO/TAO_IDL/be/be_visitor_typecode/enum_typecode.cpp4
-rw-r--r--TAO/TAO_IDL/be/be_visitor_typecode/objref_typecode.cpp4
-rw-r--r--TAO/TAO_IDL/be/be_visitor_typecode/struct_typecode.cpp4
-rw-r--r--TAO/TAO_IDL/be/be_visitor_typecode/union_typecode.cpp4
-rw-r--r--TAO/TAO_IDL/be/be_visitor_typecode/value_typecode.cpp4
8 files changed, 0 insertions, 31 deletions
diff --git a/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp b/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp
index 58cced06983..376e6244a6a 100644
--- a/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp
@@ -330,14 +330,12 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
if (be_global->tc_support ())
{
- *os << be_global->core_versioning_begin () << be_nl;
*os << "// TAO extension - the virtual _type method." << be_nl;
*os << "::CORBA::TypeCode_ptr " << node->name ()
<< "::_tao_type (void) const" << be_nl;
*os << "{" << be_idt_nl;
*os << "return ::" << node->tc_name () << ";" << be_uidt_nl;
*os << "}";
- *os << be_global->core_versioning_end () << be_nl;
}
// Make sure we are generating to *C.cpp regardless of the above.
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
index 22c109595b2..1ffea0d9e62 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
@@ -59,9 +59,6 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
*os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
<< "// " << __FILE__ << ":" << __LINE__;
- *os << be_nl << be_nl;
- *os << be_global->core_versioning_begin () << be_nl;
-
if (node->is_defined ())
{
*os << be_nl << be_nl
@@ -512,8 +509,6 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
}
}
- *os << be_global->core_versioning_end () << be_nl;
-
return 0;
}
diff --git a/TAO/TAO_IDL/be/be_visitor_typecode/alias_typecode.cpp b/TAO/TAO_IDL/be/be_visitor_typecode/alias_typecode.cpp
index 1144c16213d..c922bca275c 100644
--- a/TAO/TAO_IDL/be/be_visitor_typecode/alias_typecode.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_typecode/alias_typecode.cpp
@@ -49,8 +49,6 @@ TAO::be_visitor_alias_typecode::common (be_type * node,
<< "// TAO_IDL - Generated from" << be_nl
<< "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
- os << be_global->core_versioning_begin () << be_nl;
-
this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_TYPECODE_NESTED);
// Generate typecode for the base type, being careful to avoid doing
@@ -92,7 +90,5 @@ TAO::be_visitor_alias_typecode::common (be_type * node,
if (this->gen_typecode_ptr (node) != 0)
return -1;
- os << be_global->core_versioning_end () << be_nl;
-
return 0;
}
diff --git a/TAO/TAO_IDL/be/be_visitor_typecode/enum_typecode.cpp b/TAO/TAO_IDL/be/be_visitor_typecode/enum_typecode.cpp
index 535db7c8e1c..2108aba8850 100644
--- a/TAO/TAO_IDL/be/be_visitor_typecode/enum_typecode.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_typecode/enum_typecode.cpp
@@ -33,8 +33,6 @@ TAO::be_visitor_enum_typecode::visit_enum (be_enum * node)
<< "// TAO_IDL - Generated from" << be_nl
<< "// " << __FILE__ << ":" << __LINE__ << be_nl;
- os << be_global->core_versioning_begin () << be_nl;
-
static ACE_CString const tao_enumerators ("_tao_enumerators_");
ACE_CString const enumerators_name (tao_enumerators
+ node->flat_name ());
@@ -67,8 +65,6 @@ TAO::be_visitor_enum_typecode::visit_enum (be_enum * node)
if (this->gen_typecode_ptr (node) != 0)
return -1;
- os << be_global->core_versioning_end () << be_nl;
-
return 0;
}
diff --git a/TAO/TAO_IDL/be/be_visitor_typecode/objref_typecode.cpp b/TAO/TAO_IDL/be/be_visitor_typecode/objref_typecode.cpp
index dd14d8fe2a6..8df2556f997 100644
--- a/TAO/TAO_IDL/be/be_visitor_typecode/objref_typecode.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_typecode/objref_typecode.cpp
@@ -75,8 +75,6 @@ TAO::be_visitor_objref_typecode::visit_i (char const * kind,
<< "// TAO_IDL - Generated from" << be_nl
<< "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
- os << be_global->core_versioning_begin () << be_nl;
-
// Generate the TypeCode instantiation.
os
<< "static TAO::TypeCode::Objref<char const *," << be_nl
@@ -91,7 +89,5 @@ TAO::be_visitor_objref_typecode::visit_i (char const * kind,
if (this->gen_typecode_ptr (node) != 0)
return -1;
- os << be_global->core_versioning_end () << be_nl;
-
return 0;
}
diff --git a/TAO/TAO_IDL/be/be_visitor_typecode/struct_typecode.cpp b/TAO/TAO_IDL/be/be_visitor_typecode/struct_typecode.cpp
index 16e6d4003ee..0ff1d7c32dd 100644
--- a/TAO/TAO_IDL/be/be_visitor_typecode/struct_typecode.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_typecode/struct_typecode.cpp
@@ -85,8 +85,6 @@ TAO::be_visitor_struct_typecode::visit (AST_Structure * node,
<< "// TAO_IDL - Generated from" << be_nl
<< "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
- os << be_global->core_versioning_begin () << be_nl;
-
if (this->gen_member_typecodes (node) != 0)
ACE_ERROR_RETURN ((LM_ERROR,
"TAO::be_visitor_struct_typecode::visit_structure - "
@@ -162,8 +160,6 @@ TAO::be_visitor_struct_typecode::visit (AST_Structure * node,
if (this->gen_typecode_ptr (be_type::narrow_from_decl (node)) != 0)
return -1;
- os << be_global->core_versioning_end () << be_nl;
-
return 0;
}
diff --git a/TAO/TAO_IDL/be/be_visitor_typecode/union_typecode.cpp b/TAO/TAO_IDL/be/be_visitor_typecode/union_typecode.cpp
index a6e8d3b738d..fcc83155482 100644
--- a/TAO/TAO_IDL/be/be_visitor_typecode/union_typecode.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_typecode/union_typecode.cpp
@@ -59,8 +59,6 @@ TAO::be_visitor_union_typecode::visit_union (be_union * node)
<< "// TAO_IDL - Generated from" << be_nl
<< "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
- os << be_global->core_versioning_begin () << be_nl;
-
be_type * const discriminant_type =
be_type::narrow_from_decl (node->disc_type ());
@@ -118,8 +116,6 @@ TAO::be_visitor_union_typecode::visit_union (be_union * node)
if (this->gen_typecode_ptr (be_type::narrow_from_decl (node)) != 0)
return -1;
- os << be_global->core_versioning_end () << be_nl;
-
return 0;
}
diff --git a/TAO/TAO_IDL/be/be_visitor_typecode/value_typecode.cpp b/TAO/TAO_IDL/be/be_visitor_typecode/value_typecode.cpp
index 14f05b73a6c..14516069c35 100644
--- a/TAO/TAO_IDL/be/be_visitor_typecode/value_typecode.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_typecode/value_typecode.cpp
@@ -62,8 +62,6 @@ TAO::be_visitor_value_typecode::visit_valuetype (be_valuetype * node)
<< "// TAO_IDL - Generated from" << be_nl
<< "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
- os << be_global->core_versioning_begin () << be_nl;
-
if (this->gen_member_typecodes (node) != 0)
{
ACE_ERROR_RETURN ((LM_ERROR,
@@ -173,8 +171,6 @@ TAO::be_visitor_value_typecode::visit_valuetype (be_valuetype * node)
if (this->gen_typecode_ptr (be_type::narrow_from_decl (node)) != 0)
return -1;
- os << be_global->core_versioning_end () << be_nl;
-
return 0;
}