From 4d12b954e89f7b144cf16b8140908dd2afe52359 Mon Sep 17 00:00:00 2001 From: Phil Mesnier Date: Thu, 18 Jun 2009 22:54:50 +0000 Subject: Thu Jun 18 22:47:05 UTC 2009 Phil Mesnier * utils/logWalker/Invocation.h: * orbsvcs/tests/Notify/Bug_3688b_Regression/TestListener.h: There is a curious order-of-inclusion problem on macosx-leopoard builds whereby including a non-ACE header before something that includes ace/config.h causes a compiler error in OS_NS_stdlib.inl. It seems that on that platform, the signature of ::unsetenv() varies. I think this should be looked into in greater depth after releasing x.7.0. --- TAO/ChangeLog | 12 ++++++++++++ TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/TestListener.h | 4 ++-- TAO/utils/logWalker/Invocation.h | 1 - 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 796c242b014..f78022d37d8 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,15 @@ +Thu Jun 18 22:47:05 UTC 2009 Phil Mesnier + + * utils/logWalker/Invocation.h: + * orbsvcs/tests/Notify/Bug_3688b_Regression/TestListener.h: + + There is a curious order-of-inclusion problem on macosx-leopoard + builds whereby including a non-ACE header before something that + includes ace/config.h causes a compiler error in + OS_NS_stdlib.inl. It seems that on that platform, the signature + of ::unsetenv() varies. I think this should be looked into in + greater depth after releasing x.7.0. + Thu Jun 18 15:44:35 UTC 2009 Adam Mitz * tao/Block_Flushing_Strategy.h: diff --git a/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/TestListener.h b/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/TestListener.h index 22d6cd3e864..90a5b3f2f88 100644 --- a/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/TestListener.h +++ b/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/TestListener.h @@ -2,11 +2,11 @@ #ifndef testListener_h #define testListener_h +#include "bug3688_export.h" + #include #include -#include "bug3688_export.h" - #include "orbsvcs/CosNotifyChannelAdminS.h" #include "orbsvcs/CosNotifyCommC.h" diff --git a/TAO/utils/logWalker/Invocation.h b/TAO/utils/logWalker/Invocation.h index d6c79853cda..ccac0967b2d 100644 --- a/TAO/utils/logWalker/Invocation.h +++ b/TAO/utils/logWalker/Invocation.h @@ -6,7 +6,6 @@ #ifndef LOG_WALKER_INVOCATION_H #define LOG_WALKER_INVOCATION_H -#include #include "ace/SString.h" class PeerProcess; -- cgit v1.2.1