diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-11-10 18:17:55 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-11-10 18:17:55 +0000 |
| commit | 205fdb1e3bd8fc6e4d8b2fa09ddb8615a149acbf (patch) | |
| tree | 38aa9cee5936f08378b5db82ad1e62f2544094aa | |
| parent | 5f06dc0628f908cbc5a862b0244817705c2bb77c (diff) | |
| download | ATCD-205fdb1e3bd8fc6e4d8b2fa09ddb8615a149acbf.tar.gz | |
Wed Nov 10 18:12:41 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
* ace/Makefile.am:
* ace/ace.mpc:
* ace/ace_for_tao.mpc:
Updated for removed file
* ace/Strategies.h:
Removed this file, was for backwards compatibility but had an invalid
include in it. Thanks to Helmut Böing for reporting this
| -rw-r--r-- | ACE/ChangeLog | 11 | ||||
| -rw-r--r-- | ACE/THANKS | 1 | ||||
| -rw-r--r-- | ACE/ace/Makefile.am | 1 | ||||
| -rw-r--r-- | ACE/ace/Strategies.h | 33 | ||||
| -rw-r--r-- | ACE/ace/ace.mpc | 1 | ||||
| -rw-r--r-- | ACE/ace/ace_for_tao.mpc | 1 |
6 files changed, 12 insertions, 36 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 1f62cd6803c..61eaf046ca7 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,14 @@ +Wed Nov 10 18:12:41 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/Makefile.am: + * ace/ace.mpc: + * ace/ace_for_tao.mpc: + Updated for removed file + + * ace/Strategies.h: + Removed this file, was for backwards compatibility but had an invalid + include in it. Thanks to Helmut Böing for reporting this + Wed Nov 10 14:49:57 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl> * ace/SOCK_Dgram_Mcast.h: diff --git a/ACE/THANKS b/ACE/THANKS index 6721fd7f8f7..3dbfd553788 100644 --- a/ACE/THANKS +++ b/ACE/THANKS @@ -2340,6 +2340,7 @@ Elez <elezsh at gmail dot com> Ranjit Hande <hande at avaya dot com> Van Vuong <vanvuong1 at us dot ibm dot com> Mark <markg85 at gmail dot com> +Helmut Böing I would particularly like to thank Paul Stephenson, who worked with me at Ericsson in the early 1990's. Paul devised the recursive Makefile diff --git a/ACE/ace/Makefile.am b/ACE/ace/Makefile.am index fd731263b5a..95ecd576a81 100644 --- a/ACE/ace/Makefile.am +++ b/ACE/ace/Makefile.am @@ -985,7 +985,6 @@ nobase_include_HEADERS += \ Static_Object_Lock.h \ Stats.h \ Stats.inl \ - Strategies.h \ Strategies_T.cpp \ Strategies_T.h \ Strategies_T.inl \ diff --git a/ACE/ace/Strategies.h b/ACE/ace/Strategies.h deleted file mode 100644 index ae4c0479833..00000000000 --- a/ACE/ace/Strategies.h +++ /dev/null @@ -1,33 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file Strategies.h - * - * $Id$ - * - * @author Douglas C. Schmidt <schmidt@cs.wustl.edu> - */ -//============================================================================= - -#ifndef ACE_STRATEGIES_H -#define ACE_STRATEGIES_H -#include /**/ "ace/pre.h" - -#include /**/ "ace/config-all.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -/// Place holder for backward compatibility.. -#include "ace/Connection_Recycling_Strategy.h" -#include "ace/Hashable.h" -#include "ace/Notification_Strategy.h" -#include "ace/Reactor_Notification_Strategy.h" -#include "ace/Recyclable.h" -#include "ace/Refcountable.h" - - -#include /**/ "ace/post.h" -#endif /*ACE_STRATEGIES_H*/ diff --git a/ACE/ace/ace.mpc b/ACE/ace/ace.mpc index ca1bd4756c1..4d443b2ba53 100644 --- a/ACE/ace/ace.mpc +++ b/ACE/ace/ace.mpc @@ -430,7 +430,6 @@ project(ACE) : ace_output, acedefaults, install, other, codecs, token, svcconf, SStringfwd.h Stack_Trace.h Static_Object_Lock.h - Strategies.h String_Base_Const.h Svc_Conf.h Svc_Conf_Param.h diff --git a/ACE/ace/ace_for_tao.mpc b/ACE/ace/ace_for_tao.mpc index 593fe18efae..d1d40a29fbe 100644 --- a/ACE/ace/ace_for_tao.mpc +++ b/ACE/ace/ace_for_tao.mpc @@ -333,7 +333,6 @@ project(ACE_FOR_TAO) : acedefaults, install, svcconf, uuid, versioned_namespace, Select_Reactor.h SStringfwd.h Static_Object_Lock.h - Strategies.h String_Base_Const.h Svc_Conf.h Svc_Conf_Tokens.h |