summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbala <balanatarajan@users.noreply.github.com>2003-10-29 02:58:08 +0000
committerbala <balanatarajan@users.noreply.github.com>2003-10-29 02:58:08 +0000
commitca45598f2e16f150b2b13715c7dca9ef3084fd09 (patch)
tree312c196be0cc9fd1a80550b99fa066cfc5ad075d
parent0e9936d7a63963e66b30734189bee99bc1e52f10 (diff)
downloadATCD-ca45598f2e16f150b2b13715c7dca9ef3084fd09.tar.gz
ChangeLogTag:Tue Oct 28 20:56:41 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>
-rw-r--r--TAO/ChangeLog11
-rw-r--r--TAO/TAO_IDL/be/be_sequence.cpp2
-rw-r--r--TAO/TAO_IDL/be/be_visitor_arg_traits.cpp2
-rw-r--r--TAO/TAO_IDL/be_include/be_sequence.h2
-rw-r--r--TAO/TAO_IDL/be_include/be_visitor_arg_traits.h2
-rw-r--r--TAO/TAO_IDL/util/utl_scope.cpp2
6 files changed, 17 insertions, 4 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 781184316fe..2f349e16fec 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,14 @@
+Tue Oct 28 20:56:41 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>
+
+ * TAO_IDL/be/be_sequence.cpp:
+ * TAO_IDL/be/be_visitor_arg_traits.cpp:
+ * TAO_IDL/be_include/be_sequence.h:
+ * TAO_IDL/be_include/be_visitor_arg_traits.h:
+ * TAO_IDL/util/utl_scope.cpp:
+
+ Fixed warnings that arose due to a conversion of string to a
+ non-const pointers.
+
Tue Oct 28 15:53:42 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>
* tao/Invocation_Adapter.h:
diff --git a/TAO/TAO_IDL/be/be_sequence.cpp b/TAO/TAO_IDL/be/be_sequence.cpp
index 09f8da267fd..3ecbc425f64 100644
--- a/TAO/TAO_IDL/be/be_sequence.cpp
+++ b/TAO/TAO_IDL/be/be_sequence.cpp
@@ -528,7 +528,7 @@ be_sequence::instance_name ()
int
be_sequence::gen_base_class_name (TAO_OutStream *os,
- char * linebreak,
+ const char * linebreak,
AST_Decl *ctx_scope)
{
be_type *elem = be_type::narrow_from_decl (this->base_type ());
diff --git a/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp b/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp
index 990a2967aa9..b7108c2a5dc 100644
--- a/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp
@@ -39,7 +39,7 @@ ACE_RCSID (be,
be_visitor_arg_traits,
"$Id$")
-be_visitor_arg_traits::be_visitor_arg_traits (char *S,
+be_visitor_arg_traits::be_visitor_arg_traits (const char *S,
be_visitor_context *ctx)
: be_visitor_scope (ctx),
S_ (ACE::strnew (S))
diff --git a/TAO/TAO_IDL/be_include/be_sequence.h b/TAO/TAO_IDL/be_include/be_sequence.h
index c2efe37bb3d..7e3fb06f448 100644
--- a/TAO/TAO_IDL/be_include/be_sequence.h
+++ b/TAO/TAO_IDL/be_include/be_sequence.h
@@ -90,7 +90,7 @@ public:
// Report the instance name for instantiation.
int gen_base_class_name (TAO_OutStream *os,
- char * linebreak,
+ const char * linebreak,
AST_Decl *elem_scope);
// Common code for generating the name and parameters of our
// template sequence base class.
diff --git a/TAO/TAO_IDL/be_include/be_visitor_arg_traits.h b/TAO/TAO_IDL/be_include/be_visitor_arg_traits.h
index 6205e32b4a1..88df393849c 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_arg_traits.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_arg_traits.h
@@ -22,7 +22,7 @@
class be_visitor_arg_traits : public be_visitor_scope
{
public:
- be_visitor_arg_traits (char *S,
+ be_visitor_arg_traits (const char *S,
be_visitor_context *ctx);
virtual ~be_visitor_arg_traits (void);
diff --git a/TAO/TAO_IDL/util/utl_scope.cpp b/TAO/TAO_IDL/util/utl_scope.cpp
index 7c933b7ef01..06da1790f2f 100644
--- a/TAO/TAO_IDL/util/utl_scope.cpp
+++ b/TAO/TAO_IDL/util/utl_scope.cpp
@@ -1239,6 +1239,8 @@ UTL_Scope::lookup_pseudo (Identifier *e)
AST_Decl *scope = ScopeAsDecl (this);
char *scope_name = scope->local_name ()->get_string ();
+ ACE_UNUSED_ARG (scope_name);
+
for (; !i->is_done (); i->next ())
{
d = i->item ();