summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McQueen <simon.mcqueen@gmail.com>2005-09-12 10:36:50 +0000
committerSimon McQueen <simon.mcqueen@gmail.com>2005-09-12 10:36:50 +0000
commit076810e7def06666f4d90dc70eb845686108a5d1 (patch)
treec082f57fcd2b6ef4581b346ac020e36b00615cd5
parent76ca067e28a855222a6af78a41a03b133ec9923c (diff)
downloadATCD-076810e7def06666f4d90dc70eb845686108a5d1.tar.gz
ChangeLogTag: Mon Sep 12 11:34:13 2005 Simon McQueen <sm@prismtech.com>
-rw-r--r--TAO/ChangeLog12
-rw-r--r--TAO/tao/orb.idl2
2 files changed, 10 insertions, 4 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 48b6e4e2659..21bf4091a62 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,9 @@
+Mon Sep 12 11:34:13 2005 Simon McQueen <sm@prismtech.com>
+
+ * tao/orb.idl:
+
+ Had left fix commented out in Fri Sep 9 11:08:40 2005 Simon McQueen.
+
Fri Sep 9 22:00:24 UTC 2005 Jeff Parsons <j.parsons@vanderbilt.edu>
* TAO_IDL/ast/ast_array.cpp:
@@ -18,7 +24,7 @@ Fri Sep 9 22:00:24 UTC 2005 Jeff Parsons <j.parsons@vanderbilt.edu>
* TAO_IDL/include/ast_typedef.h:
* TAO_IDL/include/ast_union.h:
* TAO_IDL/include/ast_valuetype.h:
-
+
- Added virtual legal_for_primary_key() method to AST_Type
plus overrides for derived node classes AST_Sruct,
AST_Union, AST_Array, AST_Sequence, AST_Typedef,
@@ -26,10 +32,10 @@ Fri Sep 9 22:00:24 UTC 2005 Jeff Parsons <j.parsons@vanderbilt.edu>
AST_Valuetype is empty at this time, but when finished,
the method will be called on a valuetype when it is used
as a primary key of a component. The method will check
- the various constraints put on valuetypes used as
+ the various constraints put on valuetypes used as
primary keys by the CCM spec. It will, among other
things, be called recursively on the valuetype's members.
-
+
- Made some accessor methods, such as base_type() and
field_type(), const.
diff --git a/TAO/tao/orb.idl b/TAO/tao/orb.idl
index ad528ccd617..f6a164cf67c 100644
--- a/TAO/tao/orb.idl
+++ b/TAO/tao/orb.idl
@@ -35,7 +35,7 @@
#include <tao/ParameterMode.pidl>
#include <tao/orb_types.pidl>
#include <tao/Typecode_types.pidl>
-//#include <tao/WrongTransaction.pidl>
+#include <tao/WrongTransaction.pidl>
#pragma prefix "omg.org"