summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOssama Othman <ossama-othman@users.noreply.github.com>2005-08-22 22:49:31 +0000
committerOssama Othman <ossama-othman@users.noreply.github.com>2005-08-22 22:49:31 +0000
commit09f8aafb5ccae4d58223346115cd570780a4017e (patch)
tree222ec15bef55e0fc41aaa5a6293f3fa35217fcf7
parenta315af544977d6248269f886f463be6c932d401c (diff)
downloadATCD-09f8aafb5ccae4d58223346115cd570780a4017e.tar.gz
ChangeLogTag:Mon Aug 22 15:46:29 2005 Ossama Othman <ossama@dre.vanderbilt.edu>
-rw-r--r--TAO/ChangeLog7
-rw-r--r--TAO/tao/ORB.h2
2 files changed, 8 insertions, 1 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 60c9f6a272b..a756272a1a2 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,10 @@
+Mon Aug 22 15:46:29 2005 Ossama Othman <ossama@dre.vanderbilt.edu>
+
+ * tao/ORB.h:
+
+ Reordered include directives to work around g++ 4.0.x internal
+ compiler error.
+
Mon Aug 22 12:58:11 2005 J.T. Conklin <jtc@acorntoolworks.com>
* orbsvcs/Concurrency_Service/Makefile.am:
diff --git a/TAO/tao/ORB.h b/TAO/tao/ORB.h
index eb1d4bc509e..98216da8ecd 100644
--- a/TAO/tao/ORB.h
+++ b/TAO/tao/ORB.h
@@ -27,12 +27,12 @@
#include "orb_typesC.h"
#include "objectid.h"
-#include "Policy_ForwardC.h"
#include "CORBA_methods.h"
#include "VarOut_T.h"
#include "Seq_Var_T.h"
#include "Seq_Out_T.h"
#include "Sequence_T.h"
+#include "Policy_ForwardC.h"
#include "ace/Thread_Mutex.h"
#include "ace/Guard_T.h"