summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2005-08-22 09:39:43 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2005-08-22 09:39:43 +0000
commit0367f9db5199387f3e96c0a37a6345d550998961 (patch)
tree2c71f005b176e41d140c3935c3bc50dde10be9e8
parentf5a280c981b6f93ca5401498c4c8f9b0892dc093 (diff)
downloadATCD-0367f9db5199387f3e96c0a37a6345d550998961.tar.gz
ChangeLogTag: Mon Aug 22 09:36:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
-rw-r--r--ChangeLog18
-rw-r--r--TAO/tao/PortableServer/ThreadPolicyA.h11
2 files changed, 25 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 94ebfbf3997..0bc19dd453a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+Mon Aug 22 09:36:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * bin/MakeProjectCreator/config/bmake.features
+ * bin/MakeProjectCreator/config/borland.features
+ * bin/MakeProjectCreator/config/em3.features
+ * bin/MakeProjectCreator/config/gnuace.features
+ * bin/MakeProjectCreator/config/vc6.features
+ * bin/MakeProjectCreator/config/vc71.features
+ * bin/MakeProjectCreator/config/vc8.features
+ New features file for each project type we ship in the release.
+ This files are read by MPC for the correct type when generating
+ makefiles.
+
+ * bin/make_release:
+ No need to generate multiple default.features file in the
+ release proces, this is now handled in the features file
+ per project type
+
Mon Aug 22 08:46:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
* ace/config-unixware-7.1.0.udk.h:
diff --git a/TAO/tao/PortableServer/ThreadPolicyA.h b/TAO/tao/PortableServer/ThreadPolicyA.h
index 0f5c471402b..b74bf2f030e 100644
--- a/TAO/tao/PortableServer/ThreadPolicyA.h
+++ b/TAO/tao/PortableServer/ThreadPolicyA.h
@@ -37,21 +37,22 @@
#include "ThreadPolicyC.h"
#include "tao/AnyTypeCode/PolicyA.h"
+#if (TAO_HAS_MINIMUM_POA == 0)
// TAO_IDL - Generated from
// be\be_visitor_module/module_ch.cpp:59
namespace PortableServer
{
-
+
// TAO_IDL - Generated from
// be\be_visitor_typecode/typecode_decl.cpp:49
-
+
extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_ThreadPolicyValue;
-
+
// TAO_IDL - Generated from
// be\be_visitor_typecode/typecode_decl.cpp:49
-
+
extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_ThreadPolicy;
// TAO_IDL - Generated from
@@ -65,6 +66,8 @@ namespace PortableServer
TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ThreadPolicyValue);
TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ThreadPolicyValue &);
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
+
#include /**/ "ace/post.h"
#endif /* ifndef */