ChangeLogTag: Sun Jun 1 22:58:39 UTC 2008 William R. Otte <wotte@dre.vanderbilt.edu>

7 files changed, 22 insertions, 14 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index bf851f6d645..f281c5be2d9 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,14 @@
+Sun Jun  1 22:58:39 UTC 2008  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * TAO_IDL/contrib/mcpp/directive.cpp:
+        * TAO_IDL/contrib/mcpp/eval.cpp:
+        * TAO_IDL/contrib/mcpp/internal.H:
+        * TAO_IDL/contrib/mcpp/mbchar.cpp:
+        * TAO_IDL/contrib/mcpp/system.cpp:
+        * TAO_IDL/driver/drv_mcpp_preproc.cpp:
+
+          Fixed warnings exposed on Debian Core build. 
+        
 Sat May 31 22:06:27 UTC 2008  William R. Otte  <wotte@dre.vanderbilt.edu>
 
         * MPC/config/tao_idl_mcpp.mpb:
diff --git a/TAO/TAO_IDL/contrib/mcpp/directive.cpp b/TAO/TAO_IDL/contrib/mcpp/directive.cpp
index 298ef2f014b..d33eb02a8c3 100644
--- a/TAO/TAO_IDL/contrib/mcpp/directive.cpp
+++ b/TAO/TAO_IDL/contrib/mcpp/directive.cpp
@@ -109,7 +109,7 @@ void    directive( void)
     int     token_type;
     int     hash;
     int     c;
-    char *  tp;
+    const char *  tp;
 
     in_directive = TRUE;
     if (keep_comments) {
diff --git a/TAO/TAO_IDL/contrib/mcpp/eval.cpp b/TAO/TAO_IDL/contrib/mcpp/eval.cpp
index f75932f446e..e1019d44688 100644
--- a/TAO/TAO_IDL/contrib/mcpp/eval.cpp
+++ b/TAO/TAO_IDL/contrib/mcpp/eval.cpp
@@ -213,7 +213,7 @@ typedef struct sizes {
 
 typedef struct types {
     int         type;               /* This is the bits for types   */
-    char *      token_name;         /* this is the token word       */
+    const char *      token_name;         /* this is the token word       */
     int         excluded;           /* but these aren't legal here. */
 } TYPES;
 
diff --git a/TAO/TAO_IDL/contrib/mcpp/internal.H b/TAO/TAO_IDL/contrib/mcpp/internal.H
index 13586364722..b375f4ec6cc 100644
--- a/TAO/TAO_IDL/contrib/mcpp/internal.H
+++ b/TAO/TAO_IDL/contrib/mcpp/internal.H
@@ -400,7 +400,7 @@ extern DEFBUF * is_macro( char ** cp);
 /* mbchar.c     */
 extern size_t   (* mb_read)( int c1, char ** in_pp, char ** out_pp);
                 /* Read mbchar sequence         */
-extern const char *     set_encoding( char * name, char * env, int pragma);
+extern const char *     set_encoding( const char * name, const char * env, int pragma);
                 /* Multi-byte char encoding     */
 extern void     mb_init( void);
                 /* Initialize mbchar variables  */
diff --git a/TAO/TAO_IDL/contrib/mcpp/mbchar.cpp b/TAO/TAO_IDL/contrib/mcpp/mbchar.cpp
index 8f59ebe72e1..9be8d5b03e5 100644
--- a/TAO/TAO_IDL/contrib/mcpp/mbchar.cpp
+++ b/TAO/TAO_IDL/contrib/mcpp/mbchar.cpp
@@ -330,10 +330,9 @@ static size_t   mb_read_utf8( int c1, char ** in_pp, char ** out_pp);
 
 #define NAMLEN  20
 
-const char *    set_encoding(
-    char *  name,       /* Name of encoding specified   */
-    char *  env,        /* Name of environment variable */
-    int     pragma
+const char *    set_encoding(const char *  name,       /* Name of encoding specified   */
+			     const char *  env,        /* Name of environment variable */
+			     int     pragma
         /* 2: #pragma setlocale, 1: #pragma __setlocale, 0: not #pragma */
 )
 /*
diff --git a/TAO/TAO_IDL/contrib/mcpp/system.cpp b/TAO/TAO_IDL/contrib/mcpp/system.cpp
index 3d9679570cf..bb547cfaca5 100644
--- a/TAO/TAO_IDL/contrib/mcpp/system.cpp
+++ b/TAO/TAO_IDL/contrib/mcpp/system.cpp
@@ -1430,6 +1430,7 @@ static void def_a_macro(
     DEFBUF *    defp;
     char *      definition;                 /* Argument of -D option*/
     char *      cp;
+    const char *cp_end;
     int         i;
 
     /* Convert trigraphs for the environment which need trigraphs   */
@@ -1441,11 +1442,11 @@ static void def_a_macro(
     ACE_OS::strcpy( definition, def);
     if ((cp = ACE_OS::strchr( definition, '=')) != 0) {
         *cp = ' ';                          /* Remove the '='       */
-        cp = "\n";                          /* Append <newline>     */
+        cp_end = "\n";                          /* Append <newline>     */
     } else {
-        cp = " 1\n";                        /* With definition "1"  */
+      cp_end = " 1\n";                        /* With definition "1"  */
     }
-    ACE_OS::strcat( definition, cp);
+    ACE_OS::strcat( definition, cp_end);
     cp = definition;
     while ((char_type[ *cp & UCHARMAX] & SPA) == 0)
         cp++;
@@ -1680,7 +1681,7 @@ static void set_pragma_op( void)
  * macro.
  */
 {
-    char *  name = "_Pragma";
+    const char *  name = "_Pragma";
     char    tmp[ 16];
 
     ACE_OS::sprintf( tmp, "%c%s ( %c%c )", DEF_MAGIC, name, MAC_PARM, 1);
diff --git a/TAO/TAO_IDL/driver/drv_mcpp_preproc.cpp b/TAO/TAO_IDL/driver/drv_mcpp_preproc.cpp
index c2940e1f384..fce62a996a0 100644
--- a/TAO/TAO_IDL/driver/drv_mcpp_preproc.cpp
+++ b/TAO/TAO_IDL/driver/drv_mcpp_preproc.cpp
@@ -105,9 +105,6 @@ static long output_arg_index = 0;
 char const DIR_DOT[] = ".";
 char const DIR_DOT_DOT[] = "..";
 
-// File names.
-static char tmp_file [MAXPATHLEN + 1] = { 0 };
-
 // Lines can be 1024 chars long intially - it will expand as required.
 #define LINEBUF_SIZE 1024
 char* drv_line = 0;