From eab9e36e84ced5752ed15454d70bf65a1467ec4c Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Fri, 9 Jun 2006 18:31:05 +0000 Subject: ChangeLogTag: Fri Jun 9 14:48:12 UTC 2006 Johnny Willemsen --- TAO/examples/RTCORBA/Activity/Builder.cpp | 1 - TAO/examples/RTCORBA/Activity/Builder.h | 6 +----- TAO/examples/RTCORBA/Activity/Job_i.cpp | 1 - TAO/examples/RTCORBA/Activity/Job_i.h | 5 +---- TAO/examples/RTCORBA/Activity/POA_Holder.cpp | 1 - TAO/examples/RTCORBA/Activity/POA_Holder.h | 5 +---- TAO/examples/RTCORBA/Activity/Periodic_Task.cpp | 1 - TAO/examples/RTCORBA/Activity/Periodic_Task.h | 2 +- TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Options.cpp | 1 - TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Options.h | 4 +--- TAO/orbsvcs/tests/Notify/lib/Peer.h | 5 +---- ace/OS_NS_sys_stat.inl | 4 +++- 12 files changed, 9 insertions(+), 27 deletions(-) diff --git a/TAO/examples/RTCORBA/Activity/Builder.cpp b/TAO/examples/RTCORBA/Activity/Builder.cpp index 7ef5a89da40..c2ffa93e00c 100644 --- a/TAO/examples/RTCORBA/Activity/Builder.cpp +++ b/TAO/examples/RTCORBA/Activity/Builder.cpp @@ -1,7 +1,6 @@ //$Id$ #include "Builder.h" -#include "ace/Arg_Shifter.h" #include "ace/Get_Opt.h" #include "POA_Holder.h" #include "Job_i.h" diff --git a/TAO/examples/RTCORBA/Activity/Builder.h b/TAO/examples/RTCORBA/Activity/Builder.h index 20c001a4989..114456dabeb 100644 --- a/TAO/examples/RTCORBA/Activity/Builder.h +++ b/TAO/examples/RTCORBA/Activity/Builder.h @@ -18,13 +18,9 @@ #include "ace/Service_Config.h" #include "ace/Service_Object.h" +#include "ace/Arg_Shifter.h" #include "activity_export.h" - -ACE_BEGIN_VERSIONED_NAMESPACE_DECL -class ACE_Arg_Shifter; -ACE_END_VERSIONED_NAMESPACE_DECL - class Activity; class Periodic_Task; class Job_i; diff --git a/TAO/examples/RTCORBA/Activity/Job_i.cpp b/TAO/examples/RTCORBA/Activity/Job_i.cpp index 69320dc5323..637ea2cd7f6 100644 --- a/TAO/examples/RTCORBA/Activity/Job_i.cpp +++ b/TAO/examples/RTCORBA/Activity/Job_i.cpp @@ -2,7 +2,6 @@ #include "Job_i.h" #include "tao/debug.h" -#include "ace/Arg_Shifter.h" #include "Activity.h" diff --git a/TAO/examples/RTCORBA/Activity/Job_i.h b/TAO/examples/RTCORBA/Activity/Job_i.h index 8ca42bb86b5..d1b4ceaa3e2 100644 --- a/TAO/examples/RTCORBA/Activity/Job_i.h +++ b/TAO/examples/RTCORBA/Activity/Job_i.h @@ -16,10 +16,7 @@ #include "JobS.h" #include "activity_export.h" #include "ace/SString.h" - -ACE_BEGIN_VERSIONED_NAMESPACE_DECL -class ACE_Arg_Shifter; -ACE_END_VERSIONED_NAMESPACE_DECL +#include "ace/Arg_Shifter.h" /** * @class Job_i diff --git a/TAO/examples/RTCORBA/Activity/POA_Holder.cpp b/TAO/examples/RTCORBA/Activity/POA_Holder.cpp index 07e3f1e97b8..16eb3cd1e4d 100644 --- a/TAO/examples/RTCORBA/Activity/POA_Holder.cpp +++ b/TAO/examples/RTCORBA/Activity/POA_Holder.cpp @@ -1,6 +1,5 @@ //$Id$ #include "POA_Holder.h" -#include "ace/Arg_Shifter.h" #include "tao/debug.h" #include "ace/Log_Msg.h" diff --git a/TAO/examples/RTCORBA/Activity/POA_Holder.h b/TAO/examples/RTCORBA/Activity/POA_Holder.h index 3c056a88fba..cce1b948364 100644 --- a/TAO/examples/RTCORBA/Activity/POA_Holder.h +++ b/TAO/examples/RTCORBA/Activity/POA_Holder.h @@ -17,10 +17,7 @@ #include "tao/PortableServer/PortableServer.h" #include "activity_export.h" #include "ace/SString.h" - -ACE_BEGIN_VERSIONED_NAMESPACE_DECL -class ACE_Arg_Shifter; -ACE_END_VERSIONED_NAMESPACE_DECL +#include "ace/Arg_Shifter.h" /** * @class POA_Holder diff --git a/TAO/examples/RTCORBA/Activity/Periodic_Task.cpp b/TAO/examples/RTCORBA/Activity/Periodic_Task.cpp index 03a87bb3a6c..01e3ac4691a 100644 --- a/TAO/examples/RTCORBA/Activity/Periodic_Task.cpp +++ b/TAO/examples/RTCORBA/Activity/Periodic_Task.cpp @@ -2,7 +2,6 @@ #include "Periodic_Task.h" -#include "ace/Arg_Shifter.h" #include "ace/High_Res_Timer.h" #include "tao/debug.h" diff --git a/TAO/examples/RTCORBA/Activity/Periodic_Task.h b/TAO/examples/RTCORBA/Activity/Periodic_Task.h index ca4c822eeff..3973ee1036e 100644 --- a/TAO/examples/RTCORBA/Activity/Periodic_Task.h +++ b/TAO/examples/RTCORBA/Activity/Periodic_Task.h @@ -17,12 +17,12 @@ #include "tao/RTCORBA/Priority_Mapping_Manager.h" #include "ace/Task.h" #include "ace/SString.h" +#include "ace/Arg_Shifter.h" #include "JobC.h" #include "activity_export.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Barrier; -class ACE_Arg_Shifter; ACE_END_VERSIONED_NAMESPACE_DECL class Task_Stats; diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Options.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Options.cpp index a48dbed7cda..c8e69760669 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Options.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Options.cpp @@ -8,7 +8,6 @@ #include "Client_Options.h" -#include "ace/Arg_Shifter.h" #include "ace/Log_Msg.h" #include "ace/OS.h" diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Options.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Options.h index cbffa42aeb7..8d12ab4fafc 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Options.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Options.h @@ -17,9 +17,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -ACE_BEGIN_VERSIONED_NAMESPACE_DECL -class ACE_Arg_Shifter; -ACE_END_VERSIONED_NAMESPACE_DECL +#include "ace/Arg_Shifter.h" /// Parse the command-line client_options for the tests. /** diff --git a/TAO/orbsvcs/tests/Notify/lib/Peer.h b/TAO/orbsvcs/tests/Notify/lib/Peer.h index b1f93a4b815..cff35edb8fa 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Peer.h +++ b/TAO/orbsvcs/tests/Notify/lib/Peer.h @@ -22,10 +22,7 @@ #include "orbsvcs/CosNotifyChannelAdminC.h" #include "tao/PortableServer/PortableServer.h" #include "ace/SString.h" - -ACE_BEGIN_VERSIONED_NAMESPACE_DECL -class ACE_Arg_Shifter; -ACE_END_VERSIONED_NAMESPACE_DECL +#include "ace/Arg_Shifter.h" /** * @class TAO_Notify_Tests_Peer diff --git a/ace/OS_NS_sys_stat.inl b/ace/OS_NS_sys_stat.inl index e48ba647426..88085ddb84e 100644 --- a/ace/OS_NS_sys_stat.inl +++ b/ace/OS_NS_sys_stat.inl @@ -234,7 +234,7 @@ namespace ACE_OS // wrapper for _xstat(). ACE_OSCALL_RETURN (::_xstat (_STAT_VER, file, stp), int, -1); #elif defined (ACE_WIN32) -# if defined(__IBMCPP__) +# if defined(__IBMCPP__) || defined (__MINGW32__) ACE_OSCALL_RETURN (::_stat (file, stp), int, -1); # elif defined (__BORLANDC__) ACE_OSCALL_RETURN (::_stati64 (file, stp), int, -1); @@ -281,6 +281,8 @@ namespace ACE_OS ACE_OSCALL_RETURN (::_wstati64 (file, stp), int, -1); #elif defined (ACE_WIN32) && defined _MSC_VER && _MSC_VER >= 1300 && _MSC_VER < 1400 // vc71 ACE_OSCALL_RETURN (::_wstati64 (file, stp), int, -1); +#elif defined (__MINGW32__) + ACE_OSCALL_RETURN (::_wstat (file, stp), int, -1); #elif defined (ACE_WIN32) ACE_OSCALL_RETURN (::_wstat64 (file, stp), int, -1); #else /* ACE_HAS_WINCE */ -- cgit v1.2.1