GNOME.org
 

Changes to DynamicAny.

Hi,

recently Dietmar asked about changes to the DynamicAny module. While looking
at the changes I noticed, that the following types simply have the wrong name
and/or type: (I doublechecked with the OMG spec and it is quite clear about
this issue)

current and wrong				right

CORBA_sequence_NameValuePair		CORBA_sequence_DynamicAny_NameValuePair
CORBA_NameValuePairSeq			DynamicAny_NameValuePairSeq
CORBA_FieldName				DynamicAny_FieldName
CORBA_AnySeq				DynamicAny_AnySeq
DynamicAny_DynAny_AnySeq		DynamicAny_AnySeq

Additionally CORBA_sequence_DynamicAny_DynAny_AnySeq was defined with a
CORBA_Any** member, which should have been a CORBA_Any*.

So I corrected those things. That of course breaks source _and_ binary
compatibilty, but for features, that were almost nonexistent and wasn't yet
used by any stable released software, as far as I know (please correct me, if
I'm wrong). So considering all, I would think, we can integrate those changes
without affecting projects like gnome and bonobo negativly.

Of the above bonobo is currently using DynamicAny_DynAny_AnySeq and
CORBA_NameValuePairSeq (according to LXR). We could provide #define's to mask
the renaming, if that is necessary. I would really like to hear something from
the bonobo developers about this change.

As an alternative we could of course simply leave things broken and fix it in
ORBit2 (which needs to be done anyway, Elliot, are you listening?)

The corresponding patch is attached.

Bye,
Sebastian
-- 
Sebastian Wilhelmi
mailto:wilhelmi ira uka de
http://goethe.ira.uka.de/~wilhelmi
Index: src/orb/corba_sequences.h
===================================================================
RCS file: /cvs/gnome/ORBit/src/orb/corba_sequences.h,v
retrieving revision 1.10
diff -u -b -B -r1.10 corba_sequences.h
--- src/orb/corba_sequences.h	1999/09/20 15:42:27	1.10
+++ src/orb/corba_sequences.h	2001/03/09 16:29:26
@@ -41,13 +41,6 @@
 #define _CORBA_sequence_ORB_ObjectId_defined
 typedef struct CORBA_sequence_ORB_ObjectId CORBA_ORB_ObjectIdList;
 
-#define _CORBA_sequence_NameValuePair_defined
-typedef struct CORBA_sequence_NameValuePair CORBA_NameValuePairSeq;
-
-#define _CORBA_sequence_CORBA_any_defined
-typedef struct CORBA_sequence_CORBA_any_struct CORBA_AnySeq;
-typedef struct CORBA_sequence_CORBA_any_struct CORBA_sequence_CORBA_any;
-
 #define _CORBA_sequence_Policy_defined
 typedef struct CORBA_sequence_Policy CORBA_PolicyList;
 
Index: src/orb/corba_sequences_type.h
===================================================================
RCS file: /cvs/gnome/ORBit/src/orb/corba_sequences_type.h,v
retrieving revision 1.6
diff -u -b -B -r1.6 corba_sequences_type.h
--- src/orb/corba_sequences_type.h	1999/09/20 15:42:27	1.6
+++ src/orb/corba_sequences_type.h	2001/03/09 16:29:26
@@ -49,20 +49,6 @@
 	CORBA_boolean _release;
 };
 
-struct CORBA_sequence_NameValuePair {
-	CORBA_unsigned_long _maximum;
-	CORBA_unsigned_long _length;
-	struct CORBA_NameValuePair *_buffer;
-	CORBA_boolean _release;
-};
-
-struct CORBA_sequence_CORBA_any_struct {
-	CORBA_unsigned_long _maximum;
-	CORBA_unsigned_long _length;
-	CORBA_any *_buffer;
-	CORBA_boolean _release;
-};
-
 struct CORBA_sequence_Policy {
 	CORBA_unsigned_long _maximum;
 	CORBA_unsigned_long _length;
Index: src/orb/dynany.c
===================================================================
RCS file: /cvs/gnome/ORBit/src/orb/dynany.c,v
retrieving revision 1.9.4.18
diff -u -b -B -r1.9.4.18 dynany.c
--- src/orb/dynany.c	2001/02/19 18:30:37	1.9.4.18
+++ src/orb/dynany.c	2001/03/09 16:29:27
@@ -1354,7 +1354,7 @@
 
 /* 9.2.6 */
 
-CORBA_FieldName
+DynamicAny_FieldName
 DynamicAny_DynStruct_current_member_name (DynamicAny_DynStruct obj,
 					  CORBA_Environment *ev)
 {
@@ -1418,7 +1418,7 @@
 	return 0;
 }
 
-CORBA_NameValuePairSeq *
+DynamicAny_NameValuePairSeq *
 DynamicAny_DynStruct_get_members (DynamicAny_DynStruct obj,
 			     CORBA_Environment *ev)
 {
@@ -1428,7 +1428,7 @@
 
 void
 DynamicAny_DynStruct_set_members (DynamicAny_DynStruct obj,
-			     CORBA_NameValuePairSeq *value,
+				  DynamicAny_NameValuePairSeq *value,
 			     CORBA_Environment *ev)
 {
 	g_assert (!"Not yet implemented");
@@ -1520,7 +1520,7 @@
 	return NULL;
 }
 
-CORBA_FieldName
+DynamicAny_FieldName
 DynamicAny_DynUnion_member_name (DynamicAny_DynUnion obj,
 			    CORBA_Environment *ev)
 {
@@ -1583,13 +1583,13 @@
 
 /* 9.2.8 */
 
-DynamicAny_DynAny_AnySeq *
+DynamicAny_AnySeq *
 DynamicAny_DynSequence_get_elements (DynamicAny_DynSequence obj,
 				CORBA_Environment *ev)
 {
 	DynAny *dynany;
 	CORBA_sequence_octet *s;
-	DynamicAny_DynAny_AnySeq *retval;
+	DynamicAny_AnySeq *retval;
 	int i;
 	gpointer src;
 	CORBA_TypeCode subtc;
@@ -1610,21 +1610,17 @@
 		return NULL;
 	
 	src = s->_buffer;
-	retval = CORBA_sequence_DynamicAny_DynAny_AnySeq__alloc ();
-	retval->_buffer = CORBA_sequence_DynamicAny_DynAny_AnySeq_allocbuf (
-		s->_length);
+	retval = DynamicAny_AnySeq__alloc ();
+	retval->_buffer = CORBA_sequence_CORBA_any_allocbuf (s->_length);
 	retval->_length = s->_length;
 	subtc = dynany->any->_type->subtypes [0];
 
 	for (i = 0; i < s->_length; i++) {
-		CORBA_any *any = CORBA_any__alloc ();
 		gpointer   to;
 
-		retval->_buffer [i] = any;
-
-		any->_type = (CORBA_TypeCode) CORBA_Object_duplicate (
+		retval->_buffer [i]._type = (CORBA_TypeCode) CORBA_Object_duplicate (
 			(CORBA_Object) subtc, ev);
-		to = any->_value = ORBit_demarshal_allocate_mem (subtc, 1);
+		to = retval->_buffer [i]._value = ORBit_demarshal_allocate_mem (subtc, 1);
 		
 		_ORBit_copy_value (&src, &to, subtc);
 	}
@@ -1634,7 +1630,7 @@
 
 void
 DynamicAny_DynSequence_set_elements (DynamicAny_DynSequence obj,
-				DynamicAny_DynAny_AnySeq *value,
+				     DynamicAny_AnySeq *value,
 				CORBA_Environment *ev)
 {
 	DynAny *dynany;
@@ -1661,9 +1657,8 @@
 	subtc = dynany->any->_type->subtypes [0];
 
 	for (i = 0; i < value->_length && i < s->_length; i++) {
-		CORBA_any *a = value->_buffer [i];
-		if (!a || !a->_type ||
-		    !CORBA_TypeCode_equal (subtc, a->_type, ev)) {
+		if (!value->_buffer [i]._type ||
+		    !CORBA_TypeCode_equal (subtc, value->_buffer [i]._type, ev)) {
 			CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
 					     ex_DynamicAny_DynAny_InvalidValue, NULL);
 			return;
@@ -1674,10 +1669,7 @@
 
 	dest = s->_buffer;
 	for (i = 0; i < value->_length; i++) {
-		CORBA_any *a = value->_buffer [i];
-		gpointer src = a->_value;
-
-		_ORBit_copy_value (&src, &dest, subtc);
+		_ORBit_copy_value (&value->_buffer [i]._value, &dest, subtc);
 	}
 }
 
@@ -1764,7 +1756,7 @@
 
 /* 9.2.9 */
 
-DynamicAny_DynAny_AnySeq *
+DynamicAny_AnySeq *
 DynamicAny_DynArray_get_elements (DynamicAny_DynArray obj,
 			     CORBA_Environment *ev)
 {
@@ -1774,38 +1766,57 @@
 
 void
 DynamicAny_DynArray_set_elements (DynamicAny_DynArray obj,
-			     DynamicAny_DynAny_AnySeq *value,
+				  DynamicAny_AnySeq *value,
 			     CORBA_Environment *ev)
 {
 	g_assert (!"Not yet implemented");
 }
+
+static gpointer
+DynamicAny_NameValuePair__free(gpointer mem, gpointer dat,
+                               CORBA_boolean free_strings)
+{
+	DynamicAny_NameValuePair *var = mem;
+	
+	if (free_strings) {
+		CORBA_string__free(&(var->id), NULL, free_strings);
+	}
+	CORBA_any__free(&(var->value), NULL, free_strings);
+	return (gpointer) (var + 1);
+}
 
-static const CORBA_TypeCode
-DynamicAny_DynAny_AnySeq_subtypes_array [] = {
-	TC_any
-};
-
-static const struct CORBA_TypeCode_struct
-TC_CORBA_sequence_DynamicAny_DynAny_AnySeq_struct = {
-	{{(ORBit_RootObject_Interface *) & ORBit_TypeCode_epv, TRUE, -1},
-	 ORBIT_PSEUDO_TYPECODE},
-
-	CORBA_tk_sequence, NULL, NULL,
-	0, 1,
-	NULL,
-	(CORBA_TypeCode *) DynamicAny_DynAny_AnySeq_subtypes_array,
-	NULL,
-	CORBA_OBJECT_NIL, 0, -1, 0, 0
-};
+DynamicAny_NameValuePair *
+CORBA_sequence_DynamicAny_NameValuePair_allocbuf(CORBA_unsigned_long len)
+{   
+	DynamicAny_NameValuePair *retval =
+		ORBit_alloc(sizeof(DynamicAny_NameValuePair) * len,
+			    (ORBit_free_childvals) 
+			    DynamicAny_NameValuePair__free,
+			    GUINT_TO_POINTER(len));
+	memset(retval, '\0', sizeof(DynamicAny_NameValuePair) * len);
+	return retval;
+}
 
-CORBA_sequence_DynamicAny_DynAny_AnySeq *
-CORBA_sequence_DynamicAny_DynAny_AnySeq__alloc (void)
+static gpointer
+CORBA_sequence_DynamicAny_NameValuePair__free(gpointer mem, gpointer dat,
+                                              CORBA_boolean free_strings)
 {
-	CORBA_sequence_DynamicAny_DynAny_AnySeq *retval;
+	CORBA_sequence_DynamicAny_NameValuePair *val = mem;
 
-	retval = ORBit_demarshal_allocate_mem (
-		TC_CORBA_sequence_DynamicAny_DynAny_AnySeq, 1);
+	if (val->_release)
+		ORBit_free(val->_buffer, free_strings);
+	return (gpointer) (val + 1);
+}
+
+CORBA_sequence_DynamicAny_NameValuePair *
+CORBA_sequence_DynamicAny_NameValuePair__alloc(void)
+{
+	CORBA_sequence_DynamicAny_NameValuePair *retval;
 
+	retval = ORBit_alloc(sizeof(CORBA_sequence_DynamicAny_NameValuePair),
+			     (ORBit_free_childvals)
+			     CORBA_sequence_DynamicAny_NameValuePair__free,
+			     GUINT_TO_POINTER(1));
 	retval->_maximum = 0;
 	retval->_length = 0;
 	retval->_buffer = NULL;
@@ -1810,49 +1821,78 @@
 	retval->_length = 0;
 	retval->_buffer = NULL;
 	retval->_release = CORBA_FALSE;
-
 	return retval;
 }
+
+DynamicAny_NameValuePairSeq *
+DynamicAny_NameValuePairSeq__alloc(void)
+{
+	return CORBA_sequence_DynamicAny_NameValuePair__alloc();
+}
 
-CORBA_any **
-CORBA_sequence_DynamicAny_DynAny_AnySeq_allocbuf (CORBA_unsigned_long len)
+static gpointer
+CORBA_sequence_CORBA_any__free(gpointer mem, gpointer dat,
+                               CORBA_boolean free_strings)
 {
-	CORBA_any **retval;
+   CORBA_sequence_CORBA_any *val = mem;
 
-	retval = ORBit_demarshal_allocate_mem (
-		TC_any, len);
+   if (val->_release)
+      ORBit_free(val->_buffer, free_strings);
+   return (gpointer) (val + 1);
+}
 
-	memset (retval, '\0', sizeof (CORBA_any *) * len);
+CORBA_sequence_CORBA_any *
+CORBA_sequence_CORBA_any__alloc(void)
+{
+	CORBA_sequence_CORBA_any *retval;
 
+	retval = ORBit_alloc(sizeof(CORBA_sequence_CORBA_any),
+			     (ORBit_free_childvals) CORBA_sequence_CORBA_any__free,
+			     GUINT_TO_POINTER(1));
+	retval->_maximum = 0;
+	retval->_length = 0;
+	retval->_buffer = NULL;
+	retval->_release = CORBA_FALSE;
 	return retval;
 }
+
+DynamicAny_AnySeq *
+DynamicAny_AnySeq__alloc(void)
+{
+	return CORBA_sequence_CORBA_any__alloc();
+}
 
-static const CORBA_TypeCode
-DynamicAny_DynAny_DynAnySeq_subtypes_array [] = {
-	TC_Object
-};
-
-static const struct CORBA_TypeCode_struct
-TC_CORBA_sequence_DynamicAny_DynAny_DynAnySeq_struct = {
-	{{(ORBit_RootObject_Interface *) & ORBit_TypeCode_epv, TRUE, -1},
-	 ORBIT_PSEUDO_TYPECODE},
-
-	CORBA_tk_sequence, NULL, NULL,
-	0, 1,
-	NULL,
-	(CORBA_TypeCode *) DynamicAny_DynAny_DynAnySeq_subtypes_array,
-	NULL,
-	CORBA_OBJECT_NIL, 0, -1, 0, 0
-};
+CORBA_any *
+CORBA_sequence_CORBA_any_allocbuf (CORBA_unsigned_long len)
+{
+	CORBA_any *retval =
+		ORBit_alloc(sizeof(CORBA_any) * len,
+			    (ORBit_free_childvals) CORBA_any__free,
+			    GUINT_TO_POINTER(len));
+	memset(retval, '\0', sizeof(CORBA_any) * len);
+	return retval;
+}
 
-CORBA_sequence_DynamicAny_DynAny_DynAnySeq *
-CORBA_sequence_DynamicAny_DynAny_DynAnySeq__alloc (void)
+static gpointer
+CORBA_sequence_DynamicAny_DynAny__free(gpointer mem, gpointer dat,
+                                       CORBA_boolean free_strings)
 {
-	CORBA_sequence_DynamicAny_DynAny_DynAnySeq *retval;
+	CORBA_sequence_DynamicAny_DynAny *val = mem;
 
-	retval = ORBit_demarshal_allocate_mem (
-		TC_CORBA_sequence_DynamicAny_DynAny_DynAnySeq, 1);
+	if (val->_release)
+		ORBit_free(val->_buffer, free_strings);
+	return (gpointer) (val + 1);
+}
 
+CORBA_sequence_DynamicAny_DynAny *
+CORBA_sequence_DynamicAny_DynAny__alloc(void)
+{
+	CORBA_sequence_DynamicAny_DynAny *retval;
+	
+	retval = ORBit_alloc(sizeof(CORBA_sequence_DynamicAny_DynAny),
+			     (ORBit_free_childvals)
+			     CORBA_sequence_DynamicAny_DynAny__free,
+			     GUINT_TO_POINTER(1));
 	retval->_maximum = 0;
 	retval->_length = 0;
 	retval->_buffer = NULL;
@@ -1861,15 +1900,19 @@
 	return retval;
 }
 
-DynamicAny_DynAny *
-CORBA_sequence_DynamicAny_DynAny_DynAnySeq_allocbuf (CORBA_unsigned_long len)
+DynamicAny_DynAnySeq *
+DynamicAny_DynAnySeq__alloc(void)
 {
-	DynamicAny_DynAny *retval;
-
-	retval = ORBit_demarshal_allocate_mem (
-		TC_Object, len);
-
-	memset (retval, '\0', sizeof (DynamicAny_DynAny) * len);
+	return CORBA_sequence_DynamicAny_DynAny__alloc();
+}
 
+DynamicAny_DynAny *
+CORBA_sequence_DynamicAny_DynAny_allocbuf(CORBA_unsigned_long len)
+{
+	DynamicAny_DynAny *retval =
+		ORBit_alloc(sizeof(DynamicAny_DynAny) * len,
+			    (ORBit_free_childvals) CORBA_Object__free,
+			    GUINT_TO_POINTER(len));
+	memset(retval, '\0', sizeof(DynamicAny_DynAny) * len);
 	return retval;
 }
Index: src/orb/dynany.h
===================================================================
RCS file: /cvs/gnome/ORBit/src/orb/dynany.h,v
retrieving revision 1.8.4.11
diff -u -b -B -r1.8.4.11 dynany.h
--- src/orb/dynany.h	2000/11/27 14:10:30	1.8.4.11
+++ src/orb/dynany.h	2001/03/09 16:29:27
@@ -48,6 +48,53 @@
 	gpointer data;
 };
 
+/* typedef sequence<NameValuePair> NameValuePairSeq; */
+
+typedef struct {
+	CORBA_unsigned_long _maximum;
+	CORBA_unsigned_long _length;
+	DynamicAny_NameValuePair *_buffer;
+	CORBA_boolean _release;
+} CORBA_sequence_DynamicAny_NameValuePair;
+
+typedef CORBA_sequence_DynamicAny_NameValuePair DynamicAny_NameValuePairSeq;
+
+CORBA_sequence_DynamicAny_NameValuePair *CORBA_sequence_DynamicAny_NameValuePair__alloc(void);
+DynamicAny_NameValuePairSeq *DynamicAny_NameValuePairSeq__alloc(void);
+DynamicAny_NameValuePair *CORBA_sequence_DynamicAny_NameValuePair_allocbuf(CORBA_unsigned_long len);
+
+/* typedef sequence<any> AnySeq; */
+
+typedef struct {
+	CORBA_unsigned_long _maximum;
+	CORBA_unsigned_long _length;
+	CORBA_any *_buffer;
+	CORBA_boolean _release;
+} CORBA_sequence_CORBA_any;
+
+typedef CORBA_sequence_CORBA_any DynamicAny_AnySeq;
+
+CORBA_sequence_CORBA_any *CORBA_sequence_CORBA_any__alloc(void);
+DynamicAny_AnySeq *DynamicAny_AnySeq__alloc(void);
+CORBA_any *CORBA_sequence_CORBA_any_allocbuf (CORBA_unsigned_long len);
+
+/* typedef sequence<DynAny> DynAnySeq; */
+
+typedef struct {
+	CORBA_unsigned_long _maximum;
+	CORBA_unsigned_long  _length;
+	DynamicAny_DynAny *_buffer;
+	CORBA_boolean _release;
+} CORBA_sequence_DynamicAny_DynAny;
+
+typedef CORBA_sequence_DynamicAny_DynAny DynamicAny_DynAnySeq;
+
+CORBA_sequence_DynamicAny_DynAny *CORBA_sequence_DynamicAny_DynAny__alloc(void);
+DynamicAny_DynAnySeq *DynamicAny_DynAnySeq__alloc(void);
+DynamicAny_DynAny *CORBA_sequence_DynamicAny_DynAny_allocbuf(CORBA_unsigned_long len);
+
+/* CORBA::ORB::create.. */
+
 DynamicAny_DynAny CORBA_ORB_create_dyn_any       (CORBA_ORB obj,
 						  CORBA_any *value,
 						  CORBA_Environment *ev);
@@ -262,17 +309,17 @@
 				      CORBA_Environment *ev);
 
 /* DynStruct */
-CORBA_FieldName         DynamicAny_DynStruct_current_member_name (DynamicAny_DynStruct obj,
+DynamicAny_FieldName         DynamicAny_DynStruct_current_member_name (DynamicAny_DynStruct obj,
 								  CORBA_Environment *ev);
 
 CORBA_TCKind            DynamicAny_DynStruct_current_member_kind (DynamicAny_DynStruct obj,
 								  CORBA_Environment *ev);
 
-CORBA_NameValuePairSeq *DynamicAny_DynStruct_get_members  (DynamicAny_DynStruct obj,
+DynamicAny_NameValuePairSeq *DynamicAny_DynStruct_get_members  (DynamicAny_DynStruct obj,
 							   CORBA_Environment *ev);
 
 void                    DynamicAny_DynStruct_set_members  (DynamicAny_DynStruct obj,
-							   CORBA_NameValuePairSeq *value,
+							   DynamicAny_NameValuePairSeq *value,
 							   CORBA_Environment *ev);
 
 /* DynUnion */
@@ -298,52 +345,18 @@
 DynamicAny_DynAny  DynamicAny_DynUnion_member             (DynamicAny_DynUnion obj,
 							   CORBA_Environment *ev);
 
-CORBA_FieldName DynamicAny_DynUnion_member_name           (DynamicAny_DynUnion obj,
+DynamicAny_FieldName DynamicAny_DynUnion_member_name           (DynamicAny_DynUnion obj,
 							   CORBA_Environment *ev);
 
 CORBA_TCKind  DynamicAny_DynUnion_member_kind             (DynamicAny_DynUnion obj,
 							   CORBA_Environment *ev);
 
-typedef struct {
-	CORBA_unsigned_long _maximum,
-		_length;
-	CORBA_any **_buffer;
-	CORBA_boolean _release;
-} CORBA_sequence_DynamicAny_DynAny_AnySeq;
-
-typedef CORBA_sequence_DynamicAny_DynAny_AnySeq DynamicAny_DynAny_AnySeq;
-
-extern const struct CORBA_TypeCode_struct
-	TC_CORBA_sequence_DynamicAny_DynAny_AnySeq_struct;
-#define TC_CORBA_sequence_DynamicAny_DynAny_AnySeq \
-	((CORBA_TypeCode)&TC_CORBA_sequence_DynamicAny_DynAny_AnySeq_struct)
-
-CORBA_sequence_DynamicAny_DynAny_AnySeq *CORBA_sequence_DynamicAny_DynAny_AnySeq__alloc (void);
-CORBA_any **CORBA_sequence_DynamicAny_DynAny_AnySeq_allocbuf (CORBA_unsigned_long len);
-
-typedef struct {
-	CORBA_unsigned_long _maximum,
-		_length;
-	DynamicAny_DynAny *_buffer;
-	CORBA_boolean _release;
-} CORBA_sequence_DynamicAny_DynAny_DynAnySeq;
-
-typedef CORBA_sequence_DynamicAny_DynAny_DynAnySeq DynamicAny_DynAny_DynAnySeq;
-
-extern const struct CORBA_TypeCode_struct
-	TC_CORBA_sequence_DynamicAny_DynAny_DynAnySeq_struct;
-#define TC_CORBA_sequence_DynamicAny_DynAny_DynAnySeq \
-	((CORBA_TypeCode)&TC_CORBA_sequence_DynamicAny_DynAny_DynAnySeq_struct)
-
-CORBA_sequence_DynamicAny_DynAny_DynAnySeq *CORBA_sequence_DynamicAny_DynAny_DynAnySeq__alloc (void);
-DynamicAny_DynAny *CORBA_sequence_DynamicAny_DynAny_DynAnySeq_allocbuf (CORBA_unsigned_long len);
-
 /* DynSequence */
-DynamicAny_DynAny_AnySeq *DynamicAny_DynSequence_get_elements(DynamicAny_DynSequence obj,
+DynamicAny_AnySeq *DynamicAny_DynSequence_get_elements(DynamicAny_DynSequence obj,
 							      CORBA_Environment *ev);
 
 void DynamicAny_DynSequence_set_elements(DynamicAny_DynSequence obj,
-					 DynamicAny_DynAny_AnySeq *value,
+					 DynamicAny_AnySeq *value,
 					 CORBA_Environment *ev);
 
 CORBA_unsigned_long DynamicAny_DynSequence_get_length (DynamicAny_DynSequence obj,
@@ -354,12 +367,13 @@
 					CORBA_Environment *ev);
 
 /* DynArray */
-DynamicAny_DynAny_AnySeq *DynamicAny_DynArray_get_elements(DynamicAny_DynArray obj,
+DynamicAny_AnySeq *DynamicAny_DynArray_get_elements(DynamicAny_DynArray obj,
 							   CORBA_Environment *ev);
 
 void DynamicAny_DynArray_set_elements(DynamicAny_DynArray obj,
-				      DynamicAny_DynAny_AnySeq *value,
+				      DynamicAny_AnySeq *value,
 				      CORBA_Environment *ev);
+
 
 /*
  * These defines create the API for the inherited methods.
Index: src/orb/orbit_types.h
===================================================================
RCS file: /cvs/gnome/ORBit/src/orb/orbit_types.h,v
retrieving revision 1.42
diff -u -b -B -r1.42 orbit_types.h
--- src/orb/orbit_types.h	1999/10/24 02:39:25	1.42
+++ src/orb/orbit_types.h	2001/03/09 16:29:27
@@ -146,12 +146,13 @@
 	CORBA_Flags arg_modes;		/* argument mode flags */
 } CORBA_NamedValue;
 
-typedef CORBA_char *CORBA_FieldName;
+typedef CORBA_char *DynamicAny_FieldName;
 
-typedef struct CORBA_NameValuePair {
-	CORBA_FieldName id;
+typedef struct DynamicAny_NameValuePair
+{
+	DynamicAny_FieldName id;
 	CORBA_any value;
-} CORBA_NameValuePair;
+} DynamicAny_NameValuePair;
 
 struct CORBA_Current_type {
 	int fill_me_in;
Index: test/test-dynany.c
===================================================================
RCS file: /cvs/gnome/ORBit/test/Attic/test-dynany.c,v
retrieving revision 1.1.2.11
diff -u -b -B -r1.1.2.11 test-dynany.c
--- test/test-dynany.c	2001/01/11 18:38:03	1.1.2.11
+++ test/test-dynany.c	2001/03/09 16:29:27
@@ -268,7 +268,7 @@
 	g_assert (len == 200);
 
 	{
-		DynamicAny_DynAny_AnySeq *seq;
+		DynamicAny_AnySeq *seq;
 
 		seq = DynamicAny_DynSequence_get_elements (dyn_any, ev);
 		CHECK_OK (ev);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]