ChangeLogTag:Sat Nov 1 05:40:21 UTC 2003 Don Hinton <dhinton@dresystems.com>

1 files changed, 28 insertions, 27 deletions

diff --git a/ace/OS_QoS.cpp b/ace/OS_QoS.cpp
index b1985171661..8240231b9c5 100644
--- a/ace/OS_QoS.cpp
+++ b/ace/OS_QoS.cpp
@@ -11,15 +11,16 @@
 //=============================================================================
 
 #include "ace/OS_QoS.h"
+#include "ace/OS_NS_errno.h"
 
-ACE_Flow_Spec::ACE_Flow_Spec (u_long token_rate,
-                              u_long token_bucket_size,
-                              u_long peak_bandwidth,
-                              u_long latency,
-                              u_long delay_variation,
+ACE_Flow_Spec::ACE_Flow_Spec (unsigned long token_rate,
+                              unsigned long token_bucket_size,
+                              unsigned long peak_bandwidth,
+                              unsigned long latency,
+                              unsigned long delay_variation,
                               ACE_SERVICE_TYPE service_type,
-                              u_long max_sdu_size,
-                              u_long minimum_policed_size,
+                              unsigned long max_sdu_size,
+                              unsigned long minimum_policed_size,
                               int ttl,
                               int priority)
 {
@@ -86,7 +87,7 @@ ACE_Flow_Spec::ACE_Flow_Spec (void)
 #endif /* defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) */
 }
 
-u_long
+unsigned long
 ACE_Flow_Spec::token_rate (void) const
 {
 #if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)
@@ -97,7 +98,7 @@ ACE_Flow_Spec::token_rate (void) const
 }
 
 void
-ACE_Flow_Spec::token_rate (u_long tr)
+ACE_Flow_Spec::token_rate (unsigned long tr)
 {
 #if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)
   this->TokenRate = tr;
@@ -106,7 +107,7 @@ ACE_Flow_Spec::token_rate (u_long tr)
 #endif /* ACE_HAS_WINSOCK2 */
 }
 
-u_long
+unsigned long
 ACE_Flow_Spec::token_bucket_size (void) const
 {
 #if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)
@@ -117,7 +118,7 @@ ACE_Flow_Spec::token_bucket_size (void) const
 }
 
 void
-ACE_Flow_Spec::token_bucket_size (u_long tbs)
+ACE_Flow_Spec::token_bucket_size (unsigned long tbs)
 {
 #if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)
   this->TokenBucketSize = tbs;
@@ -126,7 +127,7 @@ ACE_Flow_Spec::token_bucket_size (u_long tbs)
 #endif /* ACE_HAS_WINSOCK2 */
 }
 
-u_long
+unsigned long
 ACE_Flow_Spec::peak_bandwidth (void) const
 {
 #if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)
@@ -137,7 +138,7 @@ ACE_Flow_Spec::peak_bandwidth (void) const
 }
 
 void
-ACE_Flow_Spec::peak_bandwidth (u_long pb)
+ACE_Flow_Spec::peak_bandwidth (unsigned long pb)
 {
 #if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)
   this->PeakBandwidth = pb;
@@ -146,7 +147,7 @@ ACE_Flow_Spec::peak_bandwidth (u_long pb)
 #endif /* ACE_HAS_WINSOCK2 */
 }
 
-u_long
+unsigned long
 ACE_Flow_Spec::latency (void) const
 {
 #if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)
@@ -157,7 +158,7 @@ ACE_Flow_Spec::latency (void) const
 }
 
 void
-ACE_Flow_Spec::latency (u_long l)
+ACE_Flow_Spec::latency (unsigned long l)
 {
 #if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)
   this->Latency = l;
@@ -166,7 +167,7 @@ ACE_Flow_Spec::latency (u_long l)
 #endif /* ACE_HAS_WINSOCK2 */
 }
 
-u_long
+unsigned long
 ACE_Flow_Spec::delay_variation (void) const
 {
 #if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)
@@ -176,7 +177,7 @@ ACE_Flow_Spec::delay_variation (void) const
 #endif /* ACE_HAS_WINSOCK2 */
 }
 void
-ACE_Flow_Spec::delay_variation (u_long dv)
+ACE_Flow_Spec::delay_variation (unsigned long dv)
 {
 #if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)
   this->DelayVariation = dv;
@@ -207,7 +208,7 @@ ACE_Flow_Spec::service_type (ACE_SERVICE_TYPE st)
 #endif /* ACE_HAS_WINSOCK2 */
 }
 
-u_long
+unsigned long
 ACE_Flow_Spec::max_sdu_size (void) const
 {
 #if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) && \
@@ -219,7 +220,7 @@ ACE_Flow_Spec::max_sdu_size (void) const
 }
 
 void
-ACE_Flow_Spec::max_sdu_size (u_long mss)
+ACE_Flow_Spec::max_sdu_size (unsigned long mss)
 {
 #if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) && \
     defined (ACE_HAS_WINSOCK2_GQOS)
@@ -229,7 +230,7 @@ ACE_Flow_Spec::max_sdu_size (u_long mss)
 #endif /* ACE_HAS_WINSOCK2 */
 }
 
-u_long
+unsigned long
 ACE_Flow_Spec::minimum_policed_size (void) const
 {
 #if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) && \
@@ -241,7 +242,7 @@ ACE_Flow_Spec::minimum_policed_size (void) const
 }
 
 void
-ACE_Flow_Spec::minimum_policed_size (u_long mps)
+ACE_Flow_Spec::minimum_policed_size (unsigned long mps)
 {
 #if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) && \
     defined (ACE_HAS_WINSOCK2_GQOS)
@@ -370,7 +371,7 @@ ACE_QoS_Params::ACE_QoS_Params (iovec *caller_data,
                                 iovec *callee_data,
                                 ACE_QoS *socket_qos,
                                 ACE_QoS *group_socket_qos,
-                                u_long flags)
+                                unsigned long flags)
   : caller_data_ (caller_data),
     callee_data_ (callee_data),
     socket_qos_ (socket_qos),
@@ -427,20 +428,20 @@ ACE_QoS_Params::group_socket_qos (ACE_QoS *gsq)
   this->group_socket_qos_ = gsq;
 }
 
-u_long
+unsigned long
 ACE_QoS_Params::flags (void) const
 {
   return this->flags_;
 }
 
 void
-ACE_QoS_Params::flags (u_long f)
+ACE_QoS_Params::flags (unsigned long f)
 {
   this->flags_ = f;
 }
 
 ACE_Accept_QoS_Params::ACE_Accept_QoS_Params (ACE_QOS_CONDITION_FUNC qos_condition_callback,
-                                              u_long callback_data)
+                                              unsigned long callback_data)
   : qos_condition_callback_ (qos_condition_callback),
     callback_data_ (callback_data)
 {
@@ -458,14 +459,14 @@ ACE_Accept_QoS_Params::qos_condition_callback (ACE_QOS_CONDITION_FUNC qcc)
   this->qos_condition_callback_ = qcc;
 }
 
-u_long
+unsigned long
 ACE_Accept_QoS_Params::callback_data (void) const
 {
   return this->callback_data_;
 }
 
 void
-ACE_Accept_QoS_Params::callback_data (u_long cd)
+ACE_Accept_QoS_Params::callback_data (unsigned long cd)
 {
   this->callback_data_ = cd;
 }