Merged revisions 80944-80947 via svnmerge from

https://svn.dre.vanderbilt.edu/DOC/Middleware/trunk/TAO

........
  r80944 | johnnyw | 2008-03-14 08:56:43 -0500 (Fri, 14 Mar 2008) | 1 line
  
  Fri Mar 14 13:55:57 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
........
  r80945 | johnnyw | 2008-03-14 09:56:28 -0500 (Fri, 14 Mar 2008) | 1 line
  
  Fri Mar 14 14:55:57 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
........
  r80946 | johnc | 2008-03-14 09:57:33 -0500 (Fri, 14 Mar 2008) | 1 line
  
  ChangeLogTag: Fri Mar 14 14:55:35 UTC 2008  Ciju John  <johnc at ociweb dot com>
........
  r80947 | johnnyw | 2008-03-14 10:00:24 -0500 (Fri, 14 Mar 2008) | 1 line
  
  Fri Mar 14 14:59:57 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
........

7 files changed, 35 insertions, 1 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 270d66c9186..a076bea6c24 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,27 @@
+Fri Mar 14 14:59:57 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/IOP.pidl:
+          Added an empty pragma prefix so that the Visual Age preprocessor
+          not drops these files
+
+Fri Mar 14 14:55:35 UTC 2008  Ciju John  <johnc at ociweb dot com>
+
+        * orbsvcs/tests/Notify/Persistent_POA/run_test.pl:
+          Add test lib path.
+
+Fri Mar 14 14:55:57 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PI/PI_include.pidl:
+        * tao/RTScheduling/RTScheduler_include.pidl:
+        * tao/CodecFactory/IOP_Codec_include.pidl:
+          Added an empty pragma prefix so that the Visual Age preprocessor
+          not drops these files
+
+Fri Mar 14 13:55:57 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/default_resource.h:
+          Fixed Visual Age 6 warning
+
 Fri Mar 14 11:18:57 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * tests/Optimized_Connection/Optimized_Connection.mpc:
diff --git a/TAO/orbsvcs/tests/Notify/Persistent_POA/run_test.pl b/TAO/orbsvcs/tests/Notify/Persistent_POA/run_test.pl
index b8e02ec511d..db0b9192ea7 100755
--- a/TAO/orbsvcs/tests/Notify/Persistent_POA/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/Persistent_POA/run_test.pl
@@ -9,6 +9,8 @@ use lib "$ENV{ACE_ROOT}/bin";
 use PerlACE::Run_Test;
 use strict;
 
+PerlACE::add_lib_path ('../lib');
+
 my $ior = PerlACE::LocalFile("supplier.ior");
 my $namingior = PerlACE::LocalFile("naming.ior");
 my $notifyior = PerlACE::LocalFile("notify.ior");
diff --git a/TAO/tao/CodecFactory/IOP_Codec_include.pidl b/TAO/tao/CodecFactory/IOP_Codec_include.pidl
index f8cabadb2ae..9d814aa81a4 100644
--- a/TAO/tao/CodecFactory/IOP_Codec_include.pidl
+++ b/TAO/tao/CodecFactory/IOP_Codec_include.pidl
@@ -11,6 +11,8 @@
 #ifndef _IOP_CODEC_INCLUDE_IDL_
 #define _IOP_CODEC_INCLUDE_IDL_
 
+#pragma prefix ""
+
 ///FUZZ: disable check_for_include/
 #include "tao/CodecFactory/IOP_Codec.pidl"
 
diff --git a/TAO/tao/IOP.pidl b/TAO/tao/IOP.pidl
index 5dee8585d10..c5f578193b1 100644
--- a/TAO/tao/IOP.pidl
+++ b/TAO/tao/IOP.pidl
@@ -28,6 +28,8 @@
 #ifndef TAO_IOP_PIDL
 #define TAO_IOP_PIDL
 
+#pragma prefix ""
+
 #include "tao/IOP_IOR.pidl"
 
 #endif  /* TAO_IOP_PIDL */
diff --git a/TAO/tao/PI/PI_include.pidl b/TAO/tao/PI/PI_include.pidl
index 6bcefdcade9..e194ebf2574 100644
--- a/TAO/tao/PI/PI_include.pidl
+++ b/TAO/tao/PI/PI_include.pidl
@@ -11,6 +11,8 @@
 #ifndef _PI_INCLUDE_IDL_
 #define _PI_INCLUDE_IDL_
 
+#pragma prefix ""
+
 ///FUZZ: disable check_for_include/
 #include "tao/PI/ORBInitInfo.pidl"
 #include "tao/PI/PolicyFactory.pidl"
diff --git a/TAO/tao/RTScheduling/RTScheduler_include.pidl b/TAO/tao/RTScheduling/RTScheduler_include.pidl
index 4ab39b3131a..5dd3e67f4e5 100644
--- a/TAO/tao/RTScheduling/RTScheduler_include.pidl
+++ b/TAO/tao/RTScheduling/RTScheduler_include.pidl
@@ -32,6 +32,8 @@
 #ifndef _RT_SCHEDULER_INCLUDE_IDL_
 #define _RT_SCHEDULER_INCLUDE_IDL_
 
+#pragma prefix ""
+
 #include "tao/RTScheduling/RTScheduler.pidl"
 
 #endif /* _RT_SCHEDULER_INCLUDE_IDL_ */
diff --git a/TAO/tao/default_resource.h b/TAO/tao/default_resource.h
index 6a76a1a98a7..81cd0fe3a1e 100644
--- a/TAO/tao/default_resource.h
+++ b/TAO/tao/default_resource.h
@@ -53,7 +53,7 @@ class TAO_Codeset_Descriptor_Base;
  *
  */
 class TAO_Export TAO_Codeset_Parameters
-  : ACE_Copy_Disabled
+  : public ACE_Copy_Disabled
 {
 public:
   TAO_Codeset_Parameters (void);