.

5 files changed, 13 insertions, 12 deletions

diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/field_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/field_ch.cpp
index 7b30bb757a7..e88495def71 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/field_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/field_ch.cpp
@@ -729,7 +729,7 @@ be_visitor_valuetype_field_ch::visit_union (be_union *node)
 }
 
 void
-be_visitor_valuetype_field_ch::setenclosings (char *pre, char *post)
+be_visitor_valuetype_field_ch::setenclosings (const char *pre, const char *post)
 {
   pre_op_ = pre;
   post_op_ = post;
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/field_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/field_cs.cpp
index 31d1d47a135..b052358eae7 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/field_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/field_cs.cpp
@@ -1027,7 +1027,7 @@ be_visitor_valuetype_field_cs::visit_union (be_union *node)
 }
 
 void
-be_visitor_valuetype_field_cs::setenclosings (char *pre)
+be_visitor_valuetype_field_cs::setenclosings (const char *pre)
 {
   pre_op_ = pre;
 }
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_ch.h
index cb1e6519f20..b22d8b269ba 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_ch.h
@@ -83,14 +83,14 @@ public:
   virtual int visit_union (be_union *node);
   // visit union type
 
-  void setenclosings (char *pre, char *post);
+  void setenclosings (const char *pre, const char *post);
   const char *pre_op ();
   const char *post_op ();
   // print additional material around the field (e.g. virtual before)
 
 private:
-  char *pre_op_;
-  char *post_op_;
+  const char *pre_op_;
+  const char *post_op_;
 };
 
 #endif /* _BE_VISITOR_VALUETYPE_FIELD_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_cs.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_cs.h
index b976f21ea44..8fc2ef71e8e 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_cs.h
@@ -83,7 +83,7 @@ public:
   virtual int visit_union (be_union *node);
   // visit union type
 
-  void setenclosings (char *pre);
+  void setenclosings (const char *pre);
   const char *pre_op ();
   // print additional string before op (e.g. ACE_INLINE)
 
@@ -92,7 +92,7 @@ public:
 
   idl_bool in_obv_space_;
 private:
-  char *pre_op_;
+  const char *pre_op_;
 };
 
 #endif /* _BE_VISITOR_VALUETYPE_FIELD_CS_H_ */
diff --git a/TAO/TAO_IDL/include/fe_private.h b/TAO/TAO_IDL/include/fe_private.h
index 979289c1924..8465fa4ff37 100644
--- a/TAO/TAO_IDL/include/fe_private.h
+++ b/TAO/TAO_IDL/include/fe_private.h
@@ -90,18 +90,19 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 // define an entry for the C++ keyword and its mapping
 struct TAO_IDL_CPP_Keyword_Entry
 {
-  char *keyword_;
-  char *mapping_;
+  const char *keyword_;
+  const char *mapping_;
 };
 
-// define a table that provides the lookup for the C++ keyword. The lookup uses
-// a perfect hash function
 class TAO_IDL_CPP_Keyword_Table
 {
+  // = TITLE
+  //   Define a table that provides the lookup for the C++
+  //   keyword. The lookup uses a perfect hash function
 private:
   unsigned int hash (const char *str, unsigned int len);
 public:
   const TAO_IDL_CPP_Keyword_Entry *lookup (const char *str, unsigned int len);
 };
 
-#endif           // _FE_FE_HH
+#endif /* _FE_FE_HH */