From b101152af4ad90ec1da49553f06355c6c66cc9f8 Mon Sep 17 00:00:00 2001 From: Phil Mesnier Date: Thu, 18 Jun 2009 23:02:37 +0000 Subject: Thu Jun 18 23:03:06 UTC 2009 Phil Mesnier * tools/Config_Handlers/IRDD_Handler.h: * tools/XML/XML_Schema_Resolver.cpp: 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. --- CIAO/ChangeLog | 14 +++++++++++++- CIAO/tools/Config_Handlers/IRDD_Handler.h | 2 +- CIAO/tools/XML/XML_Schema_Resolver.cpp | 3 ++- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index 98fe273ba8b..97bced85ebe 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,10 +1,22 @@ +Thu Jun 18 23:03:06 UTC 2009 Phil Mesnier + + * tools/Config_Handlers/IRDD_Handler.h: + * tools/XML/XML_Schema_Resolver.cpp: + + 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. + Tue Jun 16 00:55:21 UTC 2009 William R. Otte * MPC/config/dance_plan_generator.mpc: * MPC/config/dance_plan_launcher_base.mpc: Linking fixes for RACE. - + Mon Jun 15 02:22:01 UTC 2009 William R. Otte * CIAO-INSTALL.html: diff --git a/CIAO/tools/Config_Handlers/IRDD_Handler.h b/CIAO/tools/Config_Handlers/IRDD_Handler.h index af641813e26..dc4955988ee 100644 --- a/CIAO/tools/Config_Handlers/IRDD_Handler.h +++ b/CIAO/tools/Config_Handlers/IRDD_Handler.h @@ -12,8 +12,8 @@ #define CIAO_CONFIG_HANDLERS_IRDD_Handler_H #include /**/ "ace/pre.h" -#include "Common.h" #include "Config_Handlers_Export.h" +#include "Common.h" #include "ace/config-lite.h" #include "Utils/Functors.h" diff --git a/CIAO/tools/XML/XML_Schema_Resolver.cpp b/CIAO/tools/XML/XML_Schema_Resolver.cpp index cc78dca37cd..afa2ef14dc7 100644 --- a/CIAO/tools/XML/XML_Schema_Resolver.cpp +++ b/CIAO/tools/XML/XML_Schema_Resolver.cpp @@ -1,8 +1,9 @@ // $Id$ +#include "XML/XML_Schema_Resolver.h" + #include #include -#include "XML/XML_Schema_Resolver.h" #include "XML/XercesString.h" #include "ace/Env_Value_T.h" -- cgit v1.2.1