summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2005-03-01 15:22:31 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2005-03-01 15:22:31 +0000
commit8216c94eb75523e74a4591ca188eecfff5e7b483 (patch)
treeb3327fc87f07a1d2917bd4d72765630d21c8d3bb
parent2651337f47c01970d9c73ff4a8fda069ba66ca96 (diff)
downloadATCD-8216c94eb75523e74a4591ca188eecfff5e7b483.tar.gz
ChangeLogTag: Tue Mar 1 15:18:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
-rw-r--r--TAO/ChangeLog5
-rw-r--r--TAO/tao/CORBALOC_Parser.cpp2
2 files changed, 6 insertions, 1 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 0cc799ae8a5..a5fe7d614b0 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,8 @@
+Tue Mar 1 15:18:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * tao/Valuetype/AbstractBase.{h,cpp}:
+ Made the _tao_marshal_v a const method
+
Tue Mar 1 01:46:22 2005 Ossama Othman <ossama@dre.vanderbilt.edu>
* TAO_IDL/be/be_visitor_interface/amh_si.cpp:
diff --git a/TAO/tao/CORBALOC_Parser.cpp b/TAO/tao/CORBALOC_Parser.cpp
index 28b1d0ae031..b3b8e13c64f 100644
--- a/TAO/tao/CORBALOC_Parser.cpp
+++ b/TAO/tao/CORBALOC_Parser.cpp
@@ -317,7 +317,7 @@ TAO_CORBALOC_Parser::make_canonical (const char *ior,
ACE_THROW (CORBA::INV_OBJREF
(CORBA::SystemException::_tao_minor_code
- (TAO_DEFAULT_MINOR_CODE, EINVAL),
+ (TAO::VMCID, EINVAL),
CORBA::COMPLETED_NO));
}
else