ChangeLogTag:Fri Jan 23 17:13:14 1998 Carlos O'Ryan <coryan@cs.wustl.edu>

12 files changed, 194 insertions, 339 deletions

diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c
index 7944871505a..efa62ffc309 100644
--- a/TAO/ChangeLog-98c
+++ b/TAO/ChangeLog-98c
@@ -1,3 +1,8 @@
+Fri Jan 23 17:13:14 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
+
+	* Merged changes from main_to_poa_merge_11 up to
+	  main_to_poa_merge_12
+
 Fri Jan 23 17:08:45 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
 	* orbsvcs/Event_Service/Event_Channel.h: 
diff --git a/TAO/TAO_IDL/fe/Makefile b/TAO/TAO_IDL/fe/Makefile
index e63bd2c8370..ed6a4f0ac09 100644
--- a/TAO/TAO_IDL/fe/Makefile
+++ b/TAO/TAO_IDL/fe/Makefile
@@ -61,15 +61,18 @@ LFLAGS	= -t
 
 # Create the parser and lexer
 y.tab.h y.tab.cpp: idl.yy
-	@-$(RM) $@
+	@-$(RM) -f $@
 	$(YACC) $(YFLAGS) idl.yy
-	mv -f y.tab.c y.tab.cpp
+	@mv -f y.tab.c y.tab.cpp
+	@patch < y.tab.cpp.diff
+	@-$(RM) -f y.tab.cpp.orig
 
 lex.yy.cpp: idl.ll y.tab.h
 	$(LEX) $(LFLAGS) idl.ll > $@
-	sed -e "s/unistd/stdio/g" -e "s@#include <@#include /**/ <@" -e "s/ECHO/TAO_ECHO/g" < $@ >> /tmp/$@
-	cp /tmp/$@ $@
-	$(RM) -f /tmp/$@
+	@sed -e "s/unistd/stdio/g" -e "s@#include <@#include /**/ <@" -e "s/ECHO/TAO_ECHO/g" < $@ >> /tmp/$@
+	@cp /tmp/$@ $@
+	@patch < lex.yy.cpp.diff
+	@-(RM) -f /tmp/$@ lex.yy.cpp.orig
 
 #----------------------------------------------------------------------------
 #	Dependencies
diff --git a/TAO/TAO_IDL/fe/lex.yy.cpp b/TAO/TAO_IDL/fe/lex.yy.cpp
index 952309b539d..53d6d29b717 100644
--- a/TAO/TAO_IDL/fe/lex.yy.cpp
+++ b/TAO/TAO_IDL/fe/lex.yy.cpp
@@ -217,12 +217,14 @@ YY_BUFFER_STATE yy_create_buffer YY_PROTO(( FILE *file, int size ));
 void yy_delete_buffer YY_PROTO(( YY_BUFFER_STATE b ));
 void yy_init_buffer YY_PROTO(( YY_BUFFER_STATE b, FILE *file ));
 
+#if 0
 static int yy_start_stack_ptr = 0;
 static int yy_start_stack_depth = 0;
 static int *yy_start_stack = 0;
 static void yy_push_state YY_PROTO(( int new_state ));
 static void yy_pop_state YY_PROTO(( void ));
 static int yy_top_state YY_PROTO(( void ));
+#endif /* 0 */
 
 static void *yy_flex_alloc YY_PROTO(( unsigned int ));
 static void *yy_flex_realloc YY_PROTO(( void *, unsigned int ));
@@ -1780,6 +1782,7 @@ FILE *file;
 	}
 
 
+#if 0
 #ifdef YY_USE_PROTOS
 static void yy_push_state( int new_state )
 #else
@@ -1825,7 +1828,7 @@ static int yy_top_state()
 	{
 	return yy_start_stack[yy_start_stack_ptr - 1];
 	}
-
+#endif /* 0 */
 
 #ifdef YY_USE_PROTOS
 static void yy_fatal_error( const char msg[] )
diff --git a/TAO/TAO_IDL/fe/y.tab.cpp b/TAO/TAO_IDL/fe/y.tab.cpp
index cd194c3b8ba..2cc5d88addc 100644
--- a/TAO/TAO_IDL/fe/y.tab.cpp
+++ b/TAO/TAO_IDL/fe/y.tab.cpp
@@ -97,12 +97,14 @@ typedef union
 
 #ifdef __STDC__
 #include <stdlib.h>
-#include <string.h>
+// #include <string.h>
 #else
 #include <malloc.h>
 #include <memory.h>
 #endif
 
+// #include <values.h>
+
 #ifdef __cplusplus
 
 #ifndef yyerror
@@ -492,52 +494,52 @@ typedef struct
 
 yytoktype yytoks[] =
 {
-	"IDENTIFIER",	257,
-	"IDL_CONST",	258,
-	"IDL_MODULE",	259,
-	"IDL_INTERFACE",	260,
-	"IDL_TYPEDEF",	261,
-	"IDL_LONG",	262,
-	"IDL_SHORT",	263,
-	"IDL_UNSIGNED",	264,
-	"IDL_DOUBLE",	265,
-	"IDL_FLOAT",	266,
-	"IDL_CHAR",	267,
-	"IDL_WCHAR",	268,
-	"IDL_OCTET",	269,
-	"IDL_BOOLEAN",	270,
-	"IDL_ANY",	271,
-	"IDL_STRUCT",	272,
-	"IDL_UNION",	273,
-	"IDL_SWITCH",	274,
-	"IDL_ENUM",	275,
-	"IDL_SEQUENCE",	276,
-	"IDL_STRING",	277,
-	"IDL_WSTRING",	278,
-	"IDL_EXCEPTION",	279,
-	"IDL_CASE",	280,
-	"IDL_DEFAULT",	281,
-	"IDL_READONLY",	282,
-	"IDL_ATTRIBUTE",	283,
-	"IDL_ONEWAY",	284,
-	"IDL_IDEMPOTENT",	285,
-	"IDL_VOID",	286,
-	"IDL_IN",	287,
-	"IDL_OUT",	288,
-	"IDL_INOUT",	289,
-	"IDL_RAISES",	290,
-	"IDL_CONTEXT",	291,
-	"IDL_NATIVE",	292,
-	"IDL_INTEGER_LITERAL",	293,
-	"IDL_STRING_LITERAL",	294,
-	"IDL_CHARACTER_LITERAL",	295,
-	"IDL_FLOATING_PT_LITERAL",	296,
-	"IDL_TRUETOK",	297,
-	"IDL_FALSETOK",	298,
-	"IDL_SCOPE_DELIMITOR",	299,
-	"IDL_LEFT_SHIFT",	300,
-	"IDL_RIGHT_SHIFT",	301,
-	"-unknown-",	-1	/* ends search */
+	{"IDENTIFIER",	257},
+	{"IDL_CONST",	258},
+	{"IDL_MODULE",	259},
+	{"IDL_INTERFACE",	260},
+	{"IDL_TYPEDEF",	261},
+	{"IDL_LONG",	262},
+	{"IDL_SHORT",	263},
+	{"IDL_UNSIGNED",	264},
+	{"IDL_DOUBLE",	265},
+	{"IDL_FLOAT",	266},
+	{"IDL_CHAR",	267},
+	{"IDL_WCHAR",	268},
+	{"IDL_OCTET",	269},
+	{"IDL_BOOLEAN",	270},
+	{"IDL_ANY",	271},
+	{"IDL_STRUCT",	272},
+	{"IDL_UNION",	273},
+	{"IDL_SWITCH",	274},
+	{"IDL_ENUM",	275},
+	{"IDL_SEQUENCE",	276},
+	{"IDL_STRING",	277},
+	{"IDL_WSTRING",	278},
+	{"IDL_EXCEPTION",	279},
+	{"IDL_CASE",	280},
+	{"IDL_DEFAULT",	281},
+	{"IDL_READONLY",	282},
+	{"IDL_ATTRIBUTE",	283},
+	{"IDL_ONEWAY",	284},
+	{"IDL_IDEMPOTENT",	285},
+	{"IDL_VOID",	286},
+	{"IDL_IN",	287},
+	{"IDL_OUT",	288},
+	{"IDL_INOUT",	289},
+	{"IDL_RAISES",	290},
+	{"IDL_CONTEXT",	291},
+	{"IDL_NATIVE",	292},
+	{"IDL_INTEGER_LITERAL",	293},
+	{"IDL_STRING_LITERAL",	294},
+	{"IDL_CHARACTER_LITERAL",	295},
+	{"IDL_FLOATING_PT_LITERAL",	296},
+	{"IDL_TRUETOK",	297},
+	{"IDL_FALSETOK",	298},
+	{"IDL_SCOPE_DELIMITOR",	299},
+	{"IDL_LEFT_SHIFT",	300},
+	{"IDL_RIGHT_SHIFT",	301},
+	{"-unknown-",	-1}	/* ends search */
 };
 
 char * yyreds[] =
@@ -896,7 +898,7 @@ int yychar;			/* current input token number */
 #define YYLEX()		yycvtok(yylex())
 /*
 ** yycvtok - return a token if i is a wchar_t value that exceeds 255.
-**	If i<255, i itself is the token.  If i>255 but the neither
+**	If i<255, i itself is the token.  If i>255 but the neither 
 **	of the 30th or 31st bit is on, i is already a token.
 */
 #if defined(__STDC__) || defined(__cplusplus)
@@ -917,7 +919,7 @@ int yycvtok(i) int i;
 		while ((last>=first)&&(first>=0)) {/*Binary search loop*/
 			mid = (first+last)/2;
 			j = yymbchars[mid].character;
-			if( j==i ){/*Found*/
+			if( j==i ){/*Found*/ 
 				return yymbchars[mid].tvalue;
 			}else if( j<i ){
 				first = mid + 1;
@@ -1359,7 +1361,7 @@ int yyparse()
 	*/
 	switch( yytmp )
 	{
-
+		
 case 4:
 # line 240 "idl.yy"
 {
@@ -3292,3 +3294,4 @@ case 285:
 	}
 	goto yystack;		/* reset registers in driver code */
 }
+
diff --git a/TAO/orbsvcs/Event_Service/GPlot_File.cpp b/TAO/orbsvcs/Event_Service/GPlot_File.cpp
index 6967cc932fe..587d97728f5 100644
--- a/TAO/orbsvcs/Event_Service/GPlot_File.cpp
+++ b/TAO/orbsvcs/Event_Service/GPlot_File.cpp
@@ -165,15 +165,15 @@ ACE_GPlot_File::set (long entry, float value)
 
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class ACE_Map_Entry<long, char *>;
 template class ACE_Map_Manager<long, char *, ACE_Null_Mutex>;
 template class ACE_Map_Iterator_Base<long, char *, ACE_Null_Mutex>;
 template class ACE_Map_Iterator<long, char *, ACE_Null_Mutex>;
 template class ACE_Map_Reverse_Iterator<long, char *, ACE_Null_Mutex>;
-template class ACE_Map_Entry<long, char *>;
 #elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#pragma instantiate ACE_Map_Entry<long, char *>
 #pragma instantiate ACE_Map_Manager<long, char *, ACE_Null_Mutex>
 #pragma instantiate ACE_Map_Iterator_Base<long, char *, ACE_Null_Mutex>
 #pragma instantiate ACE_Map_Iterator<long, char *, ACE_Null_Mutex>
 #pragma instantiate ACE_Map_Reverse_Iterator<long, char *, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Entry<long, char *>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/Event_Service/GPlot_File.h b/TAO/orbsvcs/Event_Service/GPlot_File.h
index dc6040d0ed7..278641244d2 100644
--- a/TAO/orbsvcs/Event_Service/GPlot_File.h
+++ b/TAO/orbsvcs/Event_Service/GPlot_File.h
@@ -7,7 +7,7 @@
 //
 // = AUTHOR
 //    Tim Harrison
-// 
+//
 // ============================================================================
 
 #if !defined (ACE_GPlot_File_H)
@@ -77,8 +77,9 @@ private:
   // = map_ stores all values.  It is sync'ed to file when this->close
   // is called.
   typedef ACE_Map_Entry <long, char *> GPLOT_ENTRY;
-  typedef ACE_Map_Iterator <long, char *, ACE_Null_Mutex> GPLOT_ITERATOR;
   typedef ACE_Map_Manager<long, char *, ACE_Null_Mutex> GPLOT_MAP;
+  typedef ACE_Map_Iterator <long, char *, ACE_Null_Mutex> GPLOT_ITERATOR;
+
   GPLOT_MAP map_;
 
   char filename_[BUFSIZ];
diff --git a/TAO/orbsvcs/orbsvcs/AVStreams.idl b/TAO/orbsvcs/orbsvcs/AVStreams.idl
index cef01d8a67d..3a775bc65f3 100644
--- a/TAO/orbsvcs/orbsvcs/AVStreams.idl
+++ b/TAO/orbsvcs/orbsvcs/AVStreams.idl
@@ -1,21 +1,25 @@
-// -*-c++-*-
+/* -*- C++ -*- */
 
 // $Id$
 
 // IDL for Control and Management of Audio/Video Streams
 // Revised Submission
 
-#include "PropertyService.idl"
+#include "CosPropertyService.idl"
 
-module AVStreams{
+module AVStreams
+{
 
-  struct QoS{
+  struct QoS
+  {
     string QoSType;
-    CosPropertyService::Properties QoSParams;
+    string QoSParams;
+    // @@
+    //    CosPropertyService::Properties QoSParams;
   };
-
+  
   typedef sequence<QoS> streamQoS;
-
+  
   typedef sequence<string> flowSpec;
 
   typedef sequence<string> protocolSpec;
@@ -28,7 +32,8 @@ module AVStreams{
   // This structure is defined for SFP1.0
   // Subsequent versions of the protocol may
   // specify new structures
-  struct SFPStatus{
+  struct SFPStatus
+  {
     boolean isFormatted;
     boolean isSpecialFormat;
     boolean seqNums;
@@ -40,7 +45,8 @@ module AVStreams{
 
   enum dirType {dir_in, dir_out};
 
-  struct flowStatus{
+  struct flowStatus
+  {
     string flowName;
     dirType directionality;
     flowState status;
@@ -48,54 +54,64 @@ module AVStreams{
     QoS theQoS;
   };
 
-  typedef CosPropertyService::Property streamEvent;
+  // @@
+  //  typedef CosPropertyService::Property streamEvent;
+  typedef string streamEvent;
 
   exception notSupported {};
   exception PropertyException {};
   // An flow protocol related error
   exception FPError { string flow_name; };
 
-  exception streamOpFailed{
-    string reason;};
-  exception streamOpDenied{
-    string reason;};
-  exception noSuchFlow{};
-  exception QoSRequestFailed{
-    string reason;};
-
-  interface Basic_StreamCtrl : CosPropertyService::PropertySet {
+  exception streamOpFailed
+  {
+    string reason;
+  };
+  exception streamOpDenied
+  {
+    string reason;
+  };
+  exception noSuchFlow {};
+  exception QoSRequestFailed
+  {
+    string reason;
+  };
 
+  // @@
+  //  interface Basic_StreamCtrl : CosPropertyService::PropertySet {
+  interface Basic_StreamCtrl 
+  {
     // Empty flowSpec => apply operation to all flows
-    void stop(in flowSpec the_spec) raises (noSuchFlow);
-    void start(in flowSpec the_spec) raises (noSuchFlow);
-    void destroy(in flowSpec the_spec) raises (noSuchFlow);
-
-    boolean modify_QoS(inout streamQoS new_qos,
+    void stop (in flowSpec the_spec) raises (noSuchFlow);
+    void start (in flowSpec the_spec) raises (noSuchFlow);
+    void destroy (in flowSpec the_spec) raises (noSuchFlow);
+    
+    boolean modify_QoS (inout streamQoS new_qos,
                        in flowSpec the_spec)
       raises (noSuchFlow, QoSRequestFailed);
 
     // Called by StreamEndPoint when something goes wrong
     // with a flow
-    oneway void push_event(
-                           in streamEvent the_event);
-
-    void set_FPStatus(in flowSpec the_spec,
+    oneway void push_event (in streamEvent the_event);
+    
+    void set_FPStatus (in flowSpec the_spec,
                       in string fp_name,		// Only SFP1.0 currently 
                       // specified
                       in any fp_settings)		// Currently SFP accepts 
       // SFPStatus structure
       raises (noSuchFlow, FPError);
-
-    Object get_flow_connection(in string flow_name) 
+    
+    Object get_flow_connection (in string flow_name) 
       raises (noSuchFlow, notSupported);
-
-    void set_flow_connection(in string flow_name,
+    
+    void set_flow_connection (in string flow_name,
                              in Object flow_connection)
       raises (noSuchFlow, notSupported);
   };
 
-  interface Negotiator{
-    boolean negotiate(in Negotiator remote_negotiator,
+  interface Negotiator
+  {
+    boolean negotiate (in Negotiator remote_negotiator,
                       in streamQoS qos_spec);
   };
 
@@ -104,36 +120,38 @@ module AVStreams{
   interface StreamEndPoint;
   interface StreamEndPoint_A;
   interface StreamEndPoint_B;
-
-  interface StreamCtrl : Basic_StreamCtrl {
-
+  
+  interface StreamCtrl : Basic_StreamCtrl 
+  {
+    
     boolean bind_devs(in MMDevice a_party, in MMDevice b_party,
                       inout streamQoS the_qos,
                       in flowSpec the_flows)
       raises (streamOpFailed, noSuchFlow, QoSRequestFailed);
-
+    
     boolean bind(in StreamEndPoint_A a_party,
                  in StreamEndPoint_B b_party,
                  inout streamQoS the_qos,
                  in flowSpec the_flows)
       raises (streamOpFailed, noSuchFlow, QoSRequestFailed);
-
+    
     void unbind_party(in StreamEndPoint the_ep,
                       in flowSpec the_spec)
       raises (streamOpFailed, noSuchFlow);
-
+    
     void unbind()
       raises (streamOpFailed);
   };
-
-  interface MCastConfigIf : CosPropertyService::PropertySet{
-
-    boolean set_peer(
-                     in Object peer,
+  
+  // @@
+  //  interface MCastConfigIf : CosPropertyService::PropertySet{
+  interface MCastConfigIf 
+  {
+    boolean set_peer(in Object peer,
                      inout streamQoS the_qos,
                      in flowSpec the_spec)
       raises (QoSRequestFailed, streamOpFailed);
-
+    
     void configure(in CosPropertyService::Property a_configuration);
 
     void set_initial_configuration(in CosPropertyService::Properties initial);
@@ -150,19 +168,20 @@ module AVStreams{
 
   };
 
-  interface StreamEndPoint : CosPropertyService::PropertySet{
-
+  // @@
+  //  interface StreamEndPoint : CosPropertyService::PropertySet{
+  interface StreamEndPoint 
+  {
     void stop(in flowSpec the_spec) raises (noSuchFlow);
     void start(in flowSpec the_spec) raises (noSuchFlow);
     void destroy(in flowSpec the_spec) raises (noSuchFlow);
-
+    
     boolean connect(in StreamEndPoint responder,
                     inout streamQoS qos_spec,
                     in flowSpec the_spec)
       raises (noSuchFlow, QoSRequestFailed, streamOpFailed);
 
-    boolean request_connection(
-                               in StreamEndPoint initiator,
+    boolean request_connection(in StreamEndPoint initiator,
                                in boolean is_mcast,
                                inout streamQoS qos,
                                inout flowSpec the_spec)
@@ -198,7 +217,8 @@ module AVStreams{
     void set_source_id(in long source_id);
   };
 
-  interface StreamEndPoint_A : StreamEndPoint{
+  interface StreamEndPoint_A : StreamEndPoint
+  {
 
     boolean multiconnect(inout streamQoS the_qos,
                          inout flowSpec the_spec)
@@ -215,7 +235,8 @@ module AVStreams{
       raises(streamOpFailed, noSuchFlow);
   };
 
-  interface StreamEndPoint_B : StreamEndPoint {
+  interface StreamEndPoint_B : StreamEndPoint 
+  {
 
     boolean multiconnect(inout streamQoS the_qos,
                          inout flowSpec the_spec)
@@ -223,7 +244,10 @@ module AVStreams{
               QoSRequestFailed, FPError);
   };
 
-  interface VDev : CosPropertyService::PropertySet{
+  // @@
+  //  interface VDev : CosPropertyService::PropertySet{
+  interface VDev 
+  {
 
     boolean set_peer(
                      in StreamCtrl the_ctrl,
@@ -256,9 +280,11 @@ module AVStreams{
 
   };
 
-  interface MMDevice : CosPropertyService::PropertySet {
-    StreamEndPoint_A create_A(
-                              in StreamCtrl the_requester,
+  // @@
+  //  interface MMDevice : CosPropertyService::PropertySet 
+  interface MMDevice  
+  {
+    StreamEndPoint_A create_A(in StreamCtrl the_requester,
                               out VDev the_vdev,
                               inout streamQoS the_qos,
                               out boolean met_qos,
diff --git a/TAO/orbsvcs/orbsvcs/Makefile b/TAO/orbsvcs/orbsvcs/Makefile
index fb84cd685e6..21132950983 100644
--- a/TAO/orbsvcs/orbsvcs/Makefile
+++ b/TAO/orbsvcs/orbsvcs/Makefile
@@ -17,14 +17,31 @@ IDL_FILES = \
 	RtecSchedulerC \
 	RtecSchedulerS \
 	RtecEventChannelAdminC \
-	RtecEventChannelAdminS \
+	RtecEventChannelAdminS
+
+# Compile using av=1 to compile the AVStreams stuff.
+ifdef av
+## Add the IDL-compiler generated files
+IDL_FILES += \
+	CosPropertyServiceS \
+	CosPropertyServiceC \
+	AVStreamsS \
+	AVStreamsC
+endif
 
 FILES= $(IDL_FILES) \
 	Event_Utilities \
 	Scheduler_Factory \
 	Runtime_Scheduler \
 	Scheduler_Utilities \
-	TAO_IDL_templates \
+	TAO_IDL_templates
+
+# Compile using av=1 to compile the AVStreams stuff.
+ifdef av
+## Add the implementation files 
+FILES += AVStreams_i CosPropertyService_i
+endif
+
 
 DEFS    = $(addsuffix .h,$(FILES))
 LSRC	= $(addsuffix .cpp,$(FILES))
@@ -51,6 +68,7 @@ ifndef TAO_ROOT
 TAO_ROOT = $(ACE_ROOT)/TAO
 endif
 
+
 LDFLAGS += -L$(TAO_ROOT)/tao
 CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/tao/compat -I$(TAO_ROOT)/orbsvcs $(TSS_ORB_FLAG)#-H
 
@@ -70,6 +88,14 @@ RtecEventCommC.cpp RtecEventCommS.cpp RtecEventCommC.h RtecEventCommS.h: RtecEve
 RtecEventChannelAdminC.cpp RtecEventChannelAdminS.cpp RtecEventChannelAdminC.h RtecEventChannelAdminS.h: RtecEventChannelAdmin.idl
 	$(TAO_ROOT)/TAO_IDL/tao_idl $^
 
+.PRECIOUS: CosPropertyServiceC.cpp CosPropertyServiceS.cpp CosPropertyServiceC.h CosPropertyServiceS.h
+CosPropertyServiceC.cpp CosPropertyServiceS.cpp CosPropertyServiceC.h CosPropertyServiceS.h: CosPropertyService.idl
+	$(TAO_ROOT)/TAO_IDL/tao_idl $^
+
+.PRECIOUS: AVStreamsC.cpp AVStreamsS.cpp AVStreamsC.h AVStreamsS.h
+AVStreamsC.cpp AVStreamsS.cpp AVStreamsC.h AVStreamsS.h: AVStreams.idl
+	$(TAO_ROOT)/TAO_IDL/tao_idl $^
+
 clean:
 	-/bin/rm -rf *.o Log $(BIN) obj.* core Templates.DB .make.state
  
diff --git a/TAO/orbsvcs/orbsvcs/PropertyService.idl b/TAO/orbsvcs/orbsvcs/PropertyService.idl
deleted file mode 100644
index 34192d420ce..00000000000
--- a/TAO/orbsvcs/orbsvcs/PropertyService.idl
+++ /dev/null
@@ -1,215 +0,0 @@
-// -*-c++-*- 
-
-// $Id$
-
-// The property service, downloaded from
-// ftp://ftp.omg.org/pub/docs/1995/95-06-01.ps
-
-module CosPropertyService { 
-  
-  /*****************************************************/
-  /* Data Types */
-  /*****************************************************/
-  
-  typedef string PropertyName;  
-  struct Property {   
-    PropertyName property_name;   
-    any property_value;  
-  };
-  
-  enum PropertyModeType {    
-    normal,    
-    read_only,    
-    fixed_normal,    
-    fixed_readonly,    
-    undefined   };
-
-  struct PropertyDef {   
-    PropertyName property_name;   
-    any property_value;   
-    PropertyModeType property_mode;  };
-
-  struct PropertyMode {   
-    PropertyName property_name;   
-    PropertyModeType property_mode;  
-  };
-
-  typedef sequence<PropertyName> PropertyNames;  
-  typedef sequence<Property> Properties;  
-  typedef sequence<PropertyDef> PropertyDefs;  
-  typedef sequence<PropertyMode> PropertyModes;  
-  typedef sequence<TypeCode> PropertyTypes;
-
-  interface PropertyNamesIterator;  
-  interface PropertiesIterator;  
-  interface PropertySetFactory;  
-  interface PropertySetDef;  
-  interface PropertySet;
-  
-  /*****************************************************/ 
-  /* Exceptions*/ 
-  /*****************************************************/   
-  exception ConstraintNotSupported{};   
-  exception InvalidPropertyName {};   
-  exception ConflictingProperty {};   
-  exception PropertyNotFound {};   
-  exception UnsupportedTypeCode {};   
-  exception UnsupportedProperty {};   
-  exception UnsupportedMode {};   
-  exception FixedProperty {};   
-  exception ReadOnlyProperty {};
-
-  enum ExceptionReason {    
-    invalid_property_name,    
-    conflicting_property,    
-    property_not_found,    
-    unsupported_type_code,    
-    unsupported_property,    
-    unsupported_mode,    
-    fixed_property,    
-    read_only_property   
-  };
-
-  // @@ this was a `struct' in the original definition, I changed it
-  // to be an `exception'.
-  exception PropertyException {    
-    ExceptionReason reason;    
-    PropertyName failing_property_name;   
-  };
-
-  typedef sequence<PropertyException> PropertyExceptions;
-
-  exception MultipleExceptions {    
-    PropertyExceptions exceptions;   
-  };
-
-  /*****************************************************/ 
-  /*  Interface Definitions */ 
-  /*****************************************************/  
-  
-  interface PropertySetFactory  {     
-    PropertySet create_propertyset();     
-    PropertySet create_constrained_propertyset(in PropertyTypes allowed_property_types,               
-                                               in Properties  allowed_properties)          
-      raises(ConstraintNotSupported);     
-    PropertySet create_initial_propertyset(in Properties  initial_properties)          
-      raises(MultipleExceptions);  
-  };
-
-  /*---------------------------------------------------*/  
-  interface PropertySetDefFactory  {     
-    PropertySetDef create_propertysetdef();     
-    PropertySetDef create_constrained_propertysetdef(in PropertyTypes allowed_property_types,               
-                                                     in PropertyDefs  allowed_property_defs)          
-      raises(ConstraintNotSupported);     
-    PropertySetDef create_initial_propertysetdef (in PropertyDefs initial_property_defs)          
-      raises(MultipleExceptions);  
-  };
-
-  /*---------------------------------------------------*/  
-  interface PropertySet  {     
-    /* Support for defining and modifying properties */     
-    void define_property (in PropertyName property_name,               
-                          in any property_value)          
-      raises(InvalidPropertyName,                 
-             ConflictingProperty,                 
-             UnsupportedTypeCode,
-             UnsupportedProperty,                 
-             ReadOnlyProperty);
-
-  void define_properties (in Properties nproperties)          
-    raises (MultipleExceptions);
-
-  /* Support for Getting Properties and their Names */     
-  unsigned long get_number_of_properties();
-
-  void get_all_property_names(in unsigned long how_many,
-                              out PropertyNames property_names,
-                              out PropertyNamesIterator rest);
-
-  any  get_property_value(in  PropertyName property_name)          
-    raises(PropertyNotFound,
-           InvalidPropertyName);
-
-  boolean get_properties(in PropertyNames property_names,
-                         out Properties nproperties);
-
-  void get_all_properties(in unsigned long how_many,
-                          out Properties nproperties,               
-                          out PropertiesIterator rest);
-
-  /* Support for Deleting Properties              */     
-  void delete_property (in PropertyName property_name)          
-    raises (PropertyNotFound,
-            InvalidPropertyName,                 
-            FixedProperty);
-
-  void delete_properties(in PropertyNames property_names)          
-    raises (MultipleExceptions);
-
-  boolean delete_all_properties();
-
-  /* Support for Existence Check                  */     
-  boolean is_property_defined(in PropertyName property_name)
-    raises(InvalidPropertyName);  
-  
-  };
-
-  /*---------------------------------------------------*/  
-  interface PropertySetDef:PropertySet  {     
-    /* Support for retrieval of PropertySet constraints*/     
-    void get_allowed_property_types(out PropertyTypes property_types);
-    void get_allowed_properties(out PropertyDefs property_defs);
-
-  /* Support for defining and modifying properties */     
-    void define_property_with_mode(in PropertyName property_name,               
-                                   in any property_value,               
-                                   in PropertyModeType property_mode)          
-      raises(InvalidPropertyName,
-             ConflictingProperty,                 
-             UnsupportedTypeCode,                 
-             UnsupportedProperty,                 
-             UnsupportedMode,                 
-             ReadOnlyProperty);
-
-  void define_properties_with_modes(in PropertyDefs property_defs)          
-    raises(MultipleExceptions);
-
-  /* Support for Getting and Setting Property Modes */     
-  PropertyModeType get_property_mode(in  PropertyName property_name)          
-    raises(PropertyNotFound, 
-           InvalidPropertyName);
-
-  boolean get_property_modes(in PropertyNames property_names,               
-                             out PropertyModes property_modes);
-
-  void set_property_mode(in PropertyName property_name, 
-                         in PropertyModeType property_mode)          
-    raises(InvalidPropertyName, 
-           PropertyNotFound,
-           UnsupportedMode);
-
-    void set_property_modes(in PropertyModes property_modes)          
-      raises(MultipleExceptions);  
-  };
-
-  /*---------------------------------------------------*/  
-  interface PropertyNamesIterator  
-    {     
-      void    reset();     
-      boolean next_one(out PropertyName property_name);     
-      boolean next_n (in  unsigned long how_many,
-                      out PropertyNames property_names);     
-      void    destroy();  
-    };
-
-  /*---------------------------------------------------*/  
-  interface PropertiesIterator  {     
-    void    reset();     
-    boolean next_one(out Property aproperty);     
-    boolean next_n(in unsigned long how_many,               
-                   out Properties nproperties);     
-    void    destroy();  
-  }; 
-
-};
diff --git a/TAO/tao/connect.h b/TAO/tao/connect.h
index 5d14eff6f21..b55244bf617 100644
--- a/TAO/tao/connect.h
+++ b/TAO/tao/connect.h
@@ -54,9 +54,9 @@ public:
   // Constructor.
 
   virtual int open (void *);
-  // Called by the framework when the handler is completely set up.
-  // Argument is unused.
-
+  // Called by the <Strategy_Acceptor> when the handler is completely
+  // connected.  Argument is unused.
+  
   virtual int svc (void);
   // Only used when the handler is turned into an active object by
   // calling <activate>.  This serves as the event loop in such cases.
diff --git a/TAO/tao/deep_free.cpp b/TAO/tao/deep_free.cpp
index f777883b407..89c04e4d4f2 100644
--- a/TAO/tao/deep_free.cpp
+++ b/TAO/tao/deep_free.cpp
@@ -445,6 +445,9 @@ TAO_Marshal_Sequence::deep_free (CORBA::TypeCode_ptr  tc,
   // class. That class allocate  and deallocates the buffer, using
   // virtual methods.
 
+  ACE_UNUSED_ARG (dest);
+  ACE_UNUSED_ARG (env);
+
   if (tc)
     {
       TAO_Base_Sequence *src =
diff --git a/TAO/tao/nvlist.cpp b/TAO/tao/nvlist.cpp
index a6f3daaa629..e5f930bc38d 100644
--- a/TAO/tao/nvlist.cpp
+++ b/TAO/tao/nvlist.cpp
@@ -88,7 +88,7 @@ CORBA::release (CORBA::NamedValue_ptr nv)
 CORBA::Boolean
 CORBA::is_nil (CORBA::NamedValue_ptr nv)
 {
-  return (CORBA::Boolean) nv == 0;
+  return (CORBA::Boolean) (nv == 0);
 }
 
 CORBA_NamedValue::~CORBA_NamedValue (void)
@@ -163,7 +163,7 @@ CORBA::release (CORBA::NVList_ptr nvl)
 CORBA::Boolean
 CORBA::is_nil (CORBA::NVList_ptr nvl)
 {
-  return (CORBA::Boolean) nvl == 0;
+  return (CORBA::Boolean) (nvl == 0);
 }
 
 CORBA_NVList::~CORBA_NVList (void)