summaryrefslogtreecommitdiff
path: root/TAO
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2006-04-26 08:45:07 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2006-04-26 08:45:07 +0000
commit185a4259fde569a2c55440ab71112711f95975f6 (patch)
treeb387e581df59494d6b64c7f6e4a8f82c359a2361 /TAO
parentaebbcb6bba0ceb87ed1a83dad36145f2296c928e (diff)
downloadATCD-185a4259fde569a2c55440ab71112711f95975f6.tar.gz
ChangeLogTag: Wed Apr 26 08:42:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'TAO')
-rw-r--r--TAO/CIAO/DAnCE/TargetManager/DomainDataManager.h7
-rw-r--r--TAO/ChangeLog9
2 files changed, 12 insertions, 4 deletions
diff --git a/TAO/CIAO/DAnCE/TargetManager/DomainDataManager.h b/TAO/CIAO/DAnCE/TargetManager/DomainDataManager.h
index 84e50a5fabf..ea704259a0e 100644
--- a/TAO/CIAO/DAnCE/TargetManager/DomainDataManager.h
+++ b/TAO/CIAO/DAnCE/TargetManager/DomainDataManager.h
@@ -201,10 +201,9 @@ namespace CIAO
* @param available The available Properties
*/
- void CIAO::DomainDataManager::
- match_properties (
- ::Deployment::Properties deployed,
- ::Deployment::SatisfierProperties& available);
+ void match_properties (
+ ::Deployment::Properties deployed,
+ ::Deployment::SatisfierProperties& available);
/// The different actiona that can take place
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index c5b2429cd9e..24b3423099f 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,12 @@
+Wed Apr 26 08:42:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * tao/ObjRefTemplate/ObjectReferenceTemplateC.h:
+ * tao/ObjRefTemplate/Default_ORTC.h:
+ * tao/Messaging/ExceptionHolderC.h:
+ Include the Valuetype_Adapter_Factory_Impl.h so that the
+ Valuetype library gets linked in a static build, this is
+ already updated earlier in the IDL compiler
+
Wed Apr 26 08:17:12 UTC 2006 Kees van Marle <kvmarle@remedy.nl>
* tests/Bug_1676_Regression/client.cpp: