diff options
author | nobody <nobody@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-01-23 22:55:58 +0000 |
---|---|---|
committer | nobody <nobody@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-01-23 22:55:58 +0000 |
commit | 65c2aa0fe261fdbb08027e96fe4f7d2a225edd27 (patch) | |
tree | a19245400016dceab4f35827943e6a2e1e6d70d1 | |
parent | 87b992ff8b2f13c6afc12c018a3df90f92ac7861 (diff) | |
download | ATCD-65c2aa0fe261fdbb08027e96fe4f7d2a225edd27.tar.gz |
This commit was manufactured by cvs2svn to create branch 'poa'.
-rw-r--r-- | TAO/TAO_IDL/fe/lex.yy.cpp.diff | 34 | ||||
-rw-r--r-- | TAO/TAO_IDL/fe/y.tab.cpp.diff | 127 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/AVStreams_i.cpp | 101 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/AVStreams_i.h | 25 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/CosPropertyService.idl | 216 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/CosPropertyService_i.cpp | 18 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/CosPropertyService_i.h | 25 |
7 files changed, 546 insertions, 0 deletions
diff --git a/TAO/TAO_IDL/fe/lex.yy.cpp.diff b/TAO/TAO_IDL/fe/lex.yy.cpp.diff new file mode 100644 index 00000000000..42d4c2e1c15 --- /dev/null +++ b/TAO/TAO_IDL/fe/lex.yy.cpp.diff @@ -0,0 +1,34 @@ +--- lex.yy.cpp.orig Fri Jan 23 11:21:41 1998 ++++ lex.yy.cpp Fri Jan 23 11:23:06 1998 +@@ -217,12 +217,14 @@ + 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 @@ + } + + ++#if 0 + #ifdef YY_USE_PROTOS + static void yy_push_state( int new_state ) + #else +@@ -1825,7 +1828,7 @@ + { + 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.diff b/TAO/TAO_IDL/fe/y.tab.cpp.diff new file mode 100644 index 00000000000..8f29bff9c8b --- /dev/null +++ b/TAO/TAO_IDL/fe/y.tab.cpp.diff @@ -0,0 +1,127 @@ +--- y.tab.cpp.orig Fri Jan 23 11:09:05 1998 ++++ y.tab.cpp Fri Jan 23 11:08:33 1998 +@@ -97,13 +97,13 @@ + + #ifdef __STDC__ + #include <stdlib.h> +-#include <string.h> ++// #include <string.h> + #else + #include <malloc.h> + #include <memory.h> + #endif + +-#include <values.h> ++// #include <values.h> + + #ifdef __cplusplus + +@@ -494,52 +494,52 @@ + + 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[] = +@@ -837,7 +837,9 @@ + * Copyright (c) 1993 by Sun Microsystems, Inc. + */ + ++#if !defined (ACE_WIN32) + #pragma ident "@(#)yaccpar 6.12 93/06/07 SMI" ++#endif /* ACE_WIN32 */ + + /* + ** Skeleton parser driver for yacc output diff --git a/TAO/orbsvcs/orbsvcs/AVStreams_i.cpp b/TAO/orbsvcs/orbsvcs/AVStreams_i.cpp new file mode 100644 index 00000000000..efef263bdcb --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/AVStreams_i.cpp @@ -0,0 +1,101 @@ +// $Id$ + +// ============================================================================ +// +// = LIBRARY +// cos +// +// = FILENAME +// AVStreams_i.cpp +// +// = AUTHOR +// Sumedh Mungee <sumedh@cs.wustl.edu> +// +// +// ============================================================================ + +#include "AVStreams_i.h" + +TAO_Basic_StreamCtrl::TAO_Basic_StreamCtrl (const char *obj_name) + : POA_AVStreams::Basic_StreamCtrl (obj_name) +{ +} + +TAO_Basic_StreamCtrl::~TAO_Basic_StreamCtrl () +{ +} + +void +TAO_Basic_StreamCtrl::stop (const AVStreams::flowSpec &the_spec, + CORBA::Environment &env) +{ + ACE_UNUSED_ARG (the_spec); + ACE_UNUSED_ARG (env); +} + +void +TAO_Basic_StreamCtrl::start (const AVStreams::flowSpec &the_spec, + CORBA::Environment &env) +{ + ACE_UNUSED_ARG (the_spec); + ACE_UNUSED_ARG (env); +} + +void +TAO_Basic_StreamCtrl::destroy (const AVStreams::flowSpec &the_spec, + CORBA::Environment &env) +{ + ACE_UNUSED_ARG (the_spec); + ACE_UNUSED_ARG (env); +} + + +CORBA::Boolean +TAO_Basic_StreamCtrl::modify_QoS (AVStreams::streamQoS &new_qos, + const AVStreams::flowSpec &the_spec, + CORBA::Environment &env) +{ + ACE_UNUSED_ARG (new_qos); + ACE_UNUSED_ARG (the_spec); + ACE_UNUSED_ARG (env); +} + +void +TAO_Basic_StreamCtrl::push_event (const AVStreams::streamEvent &the_event, + CORBA::Environment &env) +{ + ACE_UNUSED_ARG (the_event); + ACE_UNUSED_ARG (the_spec); + ACE_UNUSED_ARG (env); +} + +void +TAO_Basic_StreamCtrl::set_FPStatus (const AVStreams::flowSpec &the_spec, + const char *fp_name, + const CORBA::Any &fp_settings, + CORBA::Environment &env) +{ + ACE_UNUSED_ARG (the_spec); + ACE_UNUSED_ARG (fp_name); + ACE_UNUSED_ARG (fp_settings); + ACE_UNUSED_ARG (env); +} + +CORBA::Object_ptr +TAO_Basic_StreamCtrl::get_flow_connection (const char *flow_name, + CORBA::Environment &env) +{ + ACE_UNUSED_ARG (flow_name); + ACE_UNUSED_ARG (env); +} + +void +TAO_Basic_StreamCtrl::set_flow_connection (const char *flow_name, + CORBA::Object_ptr flow_connection, + CORBA::Environment &env) +{ + ACE_UNUSED_ARG (flow_name); + ACE_UNUSED_ARG (flow_connection); + ACE_UNUSED_ARG (env); +} + diff --git a/TAO/orbsvcs/orbsvcs/AVStreams_i.h b/TAO/orbsvcs/orbsvcs/AVStreams_i.h new file mode 100644 index 00000000000..95bc729b5fd --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/AVStreams_i.h @@ -0,0 +1,25 @@ +/* -*- C++ -*- */ + +// $Id$ + +// ============================================================================ +// +// = LIBRARY +// cos +// +// = FILENAME +// AVStreams_i.h +// +// = AUTHOR +// Sumedh Mungee <sumedh@cs.wustl.edu> +// +// +// ============================================================================ + +#if !defined (AVSTREAMS_I_H) +#define AVSTREAMS_I_H + +#include "orbsvcs/AVStreamsS.h" + + +#endif /* AVSTREAMS_I_H */ diff --git a/TAO/orbsvcs/orbsvcs/CosPropertyService.idl b/TAO/orbsvcs/orbsvcs/CosPropertyService.idl new file mode 100644 index 00000000000..29789cb1483 --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/CosPropertyService.idl @@ -0,0 +1,216 @@ +// -*-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; + // @@ sequences of typecodes breaks the TAO IDL Compiler!!! + // typedef sequence<TypeCode> PropertyTypes; + typedef sequence<string> 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 + }; + + 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/orbsvcs/orbsvcs/CosPropertyService_i.cpp b/TAO/orbsvcs/orbsvcs/CosPropertyService_i.cpp new file mode 100644 index 00000000000..835b0d4458a --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/CosPropertyService_i.cpp @@ -0,0 +1,18 @@ +// $Id$ + +// ============================================================================ +// +// = LIBRARY +// cos +// +// = FILENAME +// CosPropertyService_i.cpp +// +// = AUTHOR +// Sumedh Mungee <sumedh@cs.wustl.edu> +// +// +// ============================================================================ + +#include "CosPropertyService_i.h" + diff --git a/TAO/orbsvcs/orbsvcs/CosPropertyService_i.h b/TAO/orbsvcs/orbsvcs/CosPropertyService_i.h new file mode 100644 index 00000000000..6a6666db59f --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/CosPropertyService_i.h @@ -0,0 +1,25 @@ +/* -*- C++ -*- */ + +// $Id$ + +// ============================================================================ +// +// = LIBRARY +// cos +// +// = FILENAME +// CosPropertyService_i.h +// +// = AUTHOR +// Sumedh Mungee <sumedh@cs.wustl.edu> +// +// +// ============================================================================ + +#if !defined (COSPROPERTYSERVICE_I_H) +#define COSPROPERTYSERVICE_I_H + +#include "orbsvcs/CosPropertyServiceS.h" + + +#endif /* COSPROPERTYSERVICE_I_H */ |