diff options
| author | fields_t <fields_t@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-06-16 21:28:23 +0000 |
|---|---|---|
| committer | fields_t <fields_t@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-06-16 21:28:23 +0000 |
| commit | ef5da6b9f6897f2aea25c69d2a380b00521cf665 (patch) | |
| tree | 815f60401d0c20b4720a346fe9099e6feef42509 | |
| parent | 672e6e79072df56cee5096bd8de7253b1045a9a0 (diff) | |
| download | ATCD-ef5da6b9f6897f2aea25c69d2a380b00521cf665.tar.gz | |
ChangeLogTag:Thu Jun 16 14:23:08 MST 2005 Trevor Fields <fields_t@ociweb.com>
| -rw-r--r-- | TAO/ChangeLog | 9 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_array/serializer_op_cs.cpp | 2 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_field/serializer_op_cs.cpp | 2 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_sequence/serializer_op_cs.cpp | 2 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_union_branch/serializer_op_cs.cpp | 2 |
5 files changed, 13 insertions, 4 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 2c2ac5d457a..af63382100c 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,12 @@ +Thu Jun 16 14:23:08 MST 2005 Trevor Fields <fields_t@ociweb.com> + + * TAO_IDL/be/be_visitor_array/serializer_op_cs.cpp: + * TAO_IDL/be/be_visitor_field/serializer_op_cs.cpp: + * TAO_IDL/be/be_visitor_sequence/serializer_op_cs.cpp: + * TAO_IDL/be/be_visitor_union_branch/serializer_op_cs.cpp: + + Fix warning about unsigned long arg. + Thu Jun 16 18:54:01 UTC 2005 Jeff Parsons <j.parsons@vanderbilt.edu> * TAO_IDL/be/be_codegen.cpp: diff --git a/TAO/TAO_IDL/be/be_visitor_array/serializer_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_array/serializer_op_cs.cpp index d484a970a27..0a7d7fb2d3e 100644 --- a/TAO/TAO_IDL/be/be_visitor_array/serializer_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_array/serializer_op_cs.cpp @@ -835,7 +835,7 @@ be_visitor_array_serializer_op_cs::visit_node (be_type *bt) } *os << "ACE_UNUSED_ARG(_tao_array);" << be_nl; char buff[15]; - ACE_OS::sprintf(buff, "%d", str->max_size ()->ev ()->u.ulval); + ACE_OS::sprintf(buff, "%ld", str->max_size ()->ev ()->u.ulval); *os << "return _dcps_max_marshaled_size_ulong () + (" << buff; } break; diff --git a/TAO/TAO_IDL/be/be_visitor_field/serializer_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_field/serializer_op_cs.cpp index 361ce174aa5..a0c929b281a 100644 --- a/TAO/TAO_IDL/be/be_visitor_field/serializer_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_field/serializer_op_cs.cpp @@ -776,7 +776,7 @@ be_visitor_field_serializer_op_cs::visit_string (be_string *node) break; case TAO_CodeGen::TAO_MAX_MARSHALED_SIZE: char buff[15]; - ACE_OS::sprintf(buff, "%d", node->max_size ()->ev ()->u.ulval); + ACE_OS::sprintf(buff, "%ld", node->max_size ()->ev ()->u.ulval); *os << "_dcps_max_marshaled_size_ulong () + " << buff; break; case TAO_CodeGen::TAO_FIND_SIZE: diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/serializer_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/serializer_op_cs.cpp index 2ca3f3c60e0..0444ac022d0 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/serializer_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/serializer_op_cs.cpp @@ -909,7 +909,7 @@ switch (this->ctx_->sub_state ()) *os << "// bounded seq of bounded strings" << be_nl; char buff[15]; - ACE_OS::sprintf(buff, "%d", max_size); + ACE_OS::sprintf(buff, "%ld", max_size); *os << "return _dcps_max_marshaled_size_ulong () + " << be_nl << " _tao_sequence.maximum() * "; *os << "(_dcps_max_marshaled_size_ulong () + " << buff << ");"; diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/serializer_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/serializer_op_cs.cpp index 85f1b9be6b9..9e7e5ded421 100644 --- a/TAO/TAO_IDL/be/be_visitor_union_branch/serializer_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union_branch/serializer_op_cs.cpp @@ -1016,7 +1016,7 @@ be_visitor_union_branch_serializer_op_cs::visit_string (be_string *node) ACE_OS::sprintf(tmp_size_name, "tmp_string_size%d", tmp_counter++); char buff[15]; - ACE_OS::sprintf(buff, "%d", node->max_size ()->ev ()->u.ulval); + ACE_OS::sprintf(buff, "%ld", node->max_size ()->ev ()->u.ulval); *os << "size_t " << tmp_size_name << " = _dcps_max_marshaled_size_ulong () + " << buff << ";" << be_nl << "if (" << tmp_size_name << ")" << be_idt_nl |