summaryrefslogtreecommitdiff
path: root/CIAO
diff options
context:
space:
mode:
Diffstat (limited to 'CIAO')
-rw-r--r--CIAO/ChangeLog6
-rw-r--r--CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps.idl5
-rw-r--r--CIAO/connectors/dds4ccm/impl/ndds/convertors/ResourceLimitsQosPolicy.h6
3 files changed, 17 insertions, 0 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 799f5d327e9..4dd60d3b004 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,9 @@
+Mon Aug 8 10:57:32 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * connectors/dds4ccm/idl/ndds/ndds_dcps.idl:
+ * connectors/dds4ccm/impl/ndds/convertors/ResourceLimitsQosPolicy.h:
+ Provide access to some RTI specific QoS values
+
Mon Aug 8 10:53:42 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl>
* ciao/Deployment/Handlers/Component_Handler.cpp:
diff --git a/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps.idl b/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps.idl
index bfedc740075..2ef7d67f29b 100644
--- a/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps.idl
+++ b/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps.idl
@@ -532,6 +532,11 @@ module DDS {
long max_samples;
long max_instances;
long max_samples_per_instance;
+#if (CIAO_DDS4CCM_NDDS==1)
+ long initial_samples;
+ long initial_instances;
+ long instance_hash_buckets;
+#endif
};
struct EntityFactoryQosPolicy {
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/ResourceLimitsQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/ResourceLimitsQosPolicy.h
index 52606fd7248..cf9dcfd5707 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/ResourceLimitsQosPolicy.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/convertors/ResourceLimitsQosPolicy.h
@@ -17,6 +17,9 @@ operator<<= (::DDS::ResourceLimitsQosPolicy &ddsqos, const ::DDS_ResourceLimitsQ
ddsqos.max_samples = qos.max_samples;
ddsqos.max_instances = qos.max_instances;
ddsqos.max_samples_per_instance = qos.max_samples_per_instance;
+ ddsqos.initial_samples = qos.initial_samples;
+ ddsqos.initial_instances = qos.initial_instances;
+ ddsqos.instance_hash_buckets = qos.instance_hash_buckets;
}
inline void
@@ -25,6 +28,9 @@ operator<<= (::DDS_ResourceLimitsQosPolicy &ddsqos, const ::DDS::ResourceLimitsQ
ddsqos.max_samples = qos.max_samples;
ddsqos.max_instances = qos.max_instances;
ddsqos.max_samples_per_instance = qos.max_samples_per_instance;
+ ddsqos.initial_samples = qos.initial_samples;
+ ddsqos.initial_instances = qos.initial_instances;
+ ddsqos.instance_hash_buckets = qos.instance_hash_buckets;
}
#endif /* DDS4CCM_RESOURCELIMITSQOSPOLICY_H */