Thu Jul 19 07:50:21 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>

3 files changed, 18 insertions, 12 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 38afd421910..6c4580432d6 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,9 @@
+Thu Jul 19 07:50:21 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tools/IDL3_to_IDL2/be_global.{h,cpp}:
+          No need to specify "bool const" for a return value, this also
+          triggers a warning with the Intel C++ Compiler
+
 Thu Jul 19 00:50:28 UTC 2007  Krishnakumar B  <kitty@nospam.invalid.domain>
 
         * examples/Hello/Hello_Base/Hello_Base.mpc:
diff --git a/CIAO/tools/IDL3_to_IDL2/be_global.cpp b/CIAO/tools/IDL3_to_IDL2/be_global.cpp
index 6d69f480420..08dc0f67fea 100644
--- a/CIAO/tools/IDL3_to_IDL2/be_global.cpp
+++ b/CIAO/tools/IDL3_to_IDL2/be_global.cpp
@@ -65,7 +65,7 @@ BE_GlobalData::output_dir (const char* s)
   this->output_dir_ = ACE::strnew (s);
 }
 
-bool const
+bool
 BE_GlobalData::encapsulate_idl2 (void) const
 {
   return this->encapsulate_idl2_;
@@ -83,7 +83,7 @@ BE_GlobalData::parse_args (long &i, char **av)
   switch (av[i][1])
     {
       // Directory where the generated file is to
-      // be kept. Default is the current directory from which 
+      // be kept. Default is the current directory from which
       // <tao_idl3_to_idl2> is called.
       case 'o':
         if (av[i][2] == '\0')
@@ -101,7 +101,7 @@ BE_GlobalData::parse_args (long &i, char **av)
           {
             this->excluded_filenames_ += " ";
           }
-          
+
         if (av[i][2] == '\0')
           {
             this->excluded_filenames_ += av [i + 1];
@@ -165,7 +165,7 @@ BE_GlobalData::generator_init (void)
   AST_Generator *gen = 0;
   ACE_NEW_RETURN (gen,
                   AST_Generator,
-                  0);             
+                  0);
   return gen;
 }
 
diff --git a/CIAO/tools/IDL3_to_IDL2/be_global.h b/CIAO/tools/IDL3_to_IDL2/be_global.h
index e062344eb4c..47109a614ef 100644
--- a/CIAO/tools/IDL3_to_IDL2/be_global.h
+++ b/CIAO/tools/IDL3_to_IDL2/be_global.h
@@ -51,17 +51,17 @@ public:
   //=======================================
 
   // Data accessors.
-  
+
   const char *filename (void) const;
   void filename (char *fname);
 
   const char* output_dir (void) const;
   void output_dir (const char* s);
-  
-  bool const encapsulate_idl2 (void) const;
-  
+
+  bool encapsulate_idl2 (void) const;
+
   ACE_CString & excluded_filenames (void);
-  
+
   //=========================================
 
   void parse_args (long &i, char **av);
@@ -78,7 +78,7 @@ public:
 
   AST_Generator *generator_init (void);
   // Create an AST node generator.
-  
+
   int outfile_init (TAO_OutStream *&);
   // Create the output file, the associated stream, and
   // generate the initial #ifndef.
@@ -94,11 +94,11 @@ private:
   // Directory where the generated file is to be
   // kept. Default value is 0 for this string which means the current
   // directory from which the <tao_picml> is called.
-  
+
   bool encapsulate_idl2_;
   // Have the generated file just include the original file if
   // no IDL3 declarations are found by the checking visitor.
-  
+
   ACE_CString excluded_filenames_;
   // Whitespace-separated list of included IDL files
   // to be passed to the output IDL file without