diff options
author | cbeaulac <cbeaulac@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2010-02-25 18:48:18 +0000 |
---|---|---|
committer | cbeaulac <cbeaulac@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2010-02-25 18:48:18 +0000 |
commit | b40563cfb85bb75d6b7c6a6e9231e27296da829a (patch) | |
tree | 474b0475f20b61da74f6daf51f84e55de76d76b8 | |
parent | 8be9c73e395c0abc981f8d5765fc443031ccb65a (diff) | |
download | ATCD-bugzilla_fix_3334_2.tar.gz |
Thu Feb 25 18:48:15 UTC 2010 Chad Beaulac <chad@objectivesolutions.com>bugzilla_fix_3334_2
* ace/config-macosx-iphone.h
Removed from branch because it's not in the trunk
* ace/Service_Types.cpp
Reverted changes so it looks just like the trunk
#3334
-rw-r--r-- | ace/Service_Types.cpp | 3 | ||||
-rw-r--r-- | ace/config-macosx-iphone.h | 11 |
2 files changed, 0 insertions, 14 deletions
diff --git a/ace/Service_Types.cpp b/ace/Service_Types.cpp index 50e6b743944..4aa082e53e5 100644 --- a/ace/Service_Types.cpp +++ b/ace/Service_Types.cpp @@ -230,7 +230,6 @@ int ACE_Module_Type::fini (void) const { ACE_TRACE ("ACE_Module_Type::fini"); -#if 0 void *obj = this->object (); MT_Module *mod = (MT_Module *) obj; MT_Task *reader = mod->reader (); @@ -245,8 +244,6 @@ ACE_Module_Type::fini (void) const // Close the module and delete the memory. mod->close (MT_Module::M_DELETE); return ACE_Service_Type_Impl::fini (); -#endif - return 0; } int diff --git a/ace/config-macosx-iphone.h b/ace/config-macosx-iphone.h deleted file mode 100644 index 67d31c1f39b..00000000000 --- a/ace/config-macosx-iphone.h +++ /dev/null @@ -1,11 +0,0 @@ -// $Id$ -#ifndef ACE_CONFIG_MACOSX_IPHONE_H -#define ACE_CONFIG_MACOSX_IPHONE_H - -#define ACE_SIZEOF_LONG_DOUBLE 8 - -#include "ace/config-macosx-snowleopard.h" - - -#endif ACE_CONFIG_MACOSX_IPHONE_H - |