summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2011-11-29 14:07:33 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2011-11-29 14:07:33 +0000
commit321512bcf4398d626808e7621158ad0e6f068faa (patch)
treec9f9e4f5b66ed4aad51193dbb869ac4953a4f26c
parentf9584ab76fb888ec530489879dd0fd99dd4a9b2b (diff)
downloadATCD-321512bcf4398d626808e7621158ad0e6f068faa.tar.gz
Tue Nov 29 14:07:11 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl>
* tao/Messaging/AMH_Skeletons.h: * tao/PortableServer/SUpcall_commands.h: Fixed pragma once warnings
-rw-r--r--TAO/ChangeLog6
-rw-r--r--TAO/tao/Messaging/AMH_Skeletons.h4
-rw-r--r--TAO/tao/PortableServer/SUpcall_commands.h3
3 files changed, 10 insertions, 3 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index f9aa27bbf31..8d230621544 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,9 @@
+Tue Nov 29 14:07:11 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * tao/Messaging/AMH_Skeletons.h:
+ * tao/PortableServer/SUpcall_commands.h:
+ Fixed pragma once warnings
+
Tue Nov 29 12:21:12 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl>
* bin/tao_orb_tests.lst:
diff --git a/TAO/tao/Messaging/AMH_Skeletons.h b/TAO/tao/Messaging/AMH_Skeletons.h
index 3f9af9046c4..05bdba0fc7f 100644
--- a/TAO/tao/Messaging/AMH_Skeletons.h
+++ b/TAO/tao/Messaging/AMH_Skeletons.h
@@ -30,14 +30,14 @@
#include /**/ "ace/pre.h"
+#include "tao/PortableServer/Upcall_Command.h"
+
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-
#include "tao/Messaging/messaging_export.h"
-#include "tao/PortableServer/Upcall_Command.h"
#include "tao/PortableServer/Upcall_Wrapper.h"
#include "tao/operation_details.h"
diff --git a/TAO/tao/PortableServer/SUpcall_commands.h b/TAO/tao/PortableServer/SUpcall_commands.h
index b012fe202ba..4b44d4667b0 100644
--- a/TAO/tao/PortableServer/SUpcall_commands.h
+++ b/TAO/tao/PortableServer/SUpcall_commands.h
@@ -26,11 +26,12 @@
#include /**/ "ace/pre.h"
+#include "tao/PortableServer/Upcall_Command.h"
+
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "tao/PortableServer/Upcall_Command.h"
#include "tao/PortableServer/Upcall_Wrapper.h"
#include "tao/operation_details.h"