ChangeLogTag: Mon Nov 17 18:44:15 UTC 2008 Simon McQueen <sm@prismtech.com>

7 files changed, 52 insertions, 0 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 543851f9c45..85ac3e16182 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,21 @@
+Mon Nov 17 18:44:15 UTC 2008  Simon McQueen  <sm@prismtech.com>
+
+        * tao/PolicyS.h:
+
+          Add a #include of tao/PortabServer/PolicyS.h.
+
+        * tests/Bug_3513_Regression/test.cpp:
+
+          Whitespace.
+
+        * tests/Bug_3514_Regression:
+        * tests/Bug_3514_Regression/Bug_3514_Regression.mpc:
+        * tests/Bug_3514_Regression/README:
+        * tests/Bug_3514_Regression/test.idl:
+        * tests/Bug_3514_Regression/test.cpp:
+
+          Regression test for the above fix.
+
 Mon Nov 17 18:01:17 UTC 2008  Simon McQueen  <sm@prismtech.com>
 
         * TAO_IDL/util/utl_global.cpp:
diff --git a/TAO/tao/PolicyS.h b/TAO/tao/PolicyS.h
index 70b87da46b6..46912353c2e 100644
--- a/TAO/tao/PolicyS.h
+++ b/TAO/tao/PolicyS.h
@@ -14,6 +14,7 @@
 #ifndef TAO_PIDL_POLICY_S_H
 #define TAO_PIDL_POLICY_S_H
 #include "tao/PolicyC.h"
+#include "tao/PortableServer/PolicyS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/tests/Bug_3513_Regression/test.cpp b/TAO/tests/Bug_3513_Regression/test.cpp
index b639eb885fe..ca1b5553155 100644
--- a/TAO/tests/Bug_3513_Regression/test.cpp
+++ b/TAO/tests/Bug_3513_Regression/test.cpp
@@ -7,3 +7,5 @@ ACE_TMAIN (int, ACE_TCHAR *[])
 {
   return 0;
 }
+
+
diff --git a/TAO/tests/Bug_3514_Regression/Bug_3514_Regression.mpc b/TAO/tests/Bug_3514_Regression/Bug_3514_Regression.mpc
new file mode 100644
index 00000000000..bfe0e4b0ca1
--- /dev/null
+++ b/TAO/tests/Bug_3514_Regression/Bug_3514_Regression.mpc
@@ -0,0 +1,10 @@
+// -*- MPC -*-
+// $Id$
+
+project(*Test) : taoserver {
+  exename   = test
+
+  Source_Files {
+    test.cpp
+  }
+}
diff --git a/TAO/tests/Bug_3514_Regression/README b/TAO/tests/Bug_3514_Regression/README
new file mode 100644
index 00000000000..c3421fb54e2
--- /dev/null
+++ b/TAO/tests/Bug_3514_Regression/README
@@ -0,0 +1,5 @@
+# $Id$
+
+This is a compile only test. If it compiles, it's passed. 
+
+
diff --git a/TAO/tests/Bug_3514_Regression/test.cpp b/TAO/tests/Bug_3514_Regression/test.cpp
new file mode 100644
index 00000000000..551a2224cb3
--- /dev/null
+++ b/TAO/tests/Bug_3514_Regression/test.cpp
@@ -0,0 +1,10 @@
+// $Id$
+
+#include "testS.h"
+
+int
+ACE_TMAIN (int, ACE_TCHAR *[])
+{
+  return 0;
+}
+
diff --git a/TAO/tests/Bug_3514_Regression/test.idl b/TAO/tests/Bug_3514_Regression/test.idl
new file mode 100644
index 00000000000..5a884db1d07
--- /dev/null
+++ b/TAO/tests/Bug_3514_Regression/test.idl
@@ -0,0 +1,6 @@
+// $Id$
+
+#include <orb.idl>
+
+interface Foo : CORBA::Policy
+{};