Sun Aug 12 19:05:59 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl>

        * TAO_IDL/be/be_codegen.cpp:
        * TAO_IDL/be/be_global.cpp:
        * TAO_IDL/be/be_util.cpp:
        * TAO_IDL/be_include/be_global.h:
        * docs/compiler.html:
          Added stripped_filename option to overrule stripped filename
of
          input file

1 files changed, 12 insertions, 3 deletions

diff --git a/TAO/TAO_IDL/be/be_codegen.cpp b/TAO/TAO_IDL/be/be_codegen.cpp
index 4fef57ae44d..09a88c38009 100644
--- a/TAO/TAO_IDL/be/be_codegen.cpp
+++ b/TAO/TAO_IDL/be/be_codegen.cpp
@@ -3555,9 +3555,18 @@ TAO_CodeGen::gen_exec_idl_includes (void)
         "connectors/ami4ccm/ami4ccm/ami4ccm.idl");
     }
 
-  this->gen_standard_include (
-    this->ciao_exec_idl_,
-    idl_global->stripped_filename ()->get_string ());
+  if (be_global->stripped_filename ())
+    {
+      this->gen_standard_include (
+        this->ciao_exec_idl_,
+        be_global->stripped_filename ());
+    }
+  else
+    {
+      this->gen_standard_include (
+        this->ciao_exec_idl_,
+        idl_global->stripped_filename ()->get_string ());
+    }
 
   char **path_tmp = 0;