ChangeLogTag: 'head -1 ChangeLog'

4 files changed, 11 insertions, 42 deletions

diff --git a/ChangeLog-99b b/ChangeLog-99b
index 40b048ea046..02b91283dcc 100644
--- a/ChangeLog-99b
+++ b/ChangeLog-99b
@@ -1,3 +1,9 @@
+Tue Oct 19 13:31:15 1999  Joe Hoffert  <joeh@cs.wustl.edu>
+
+        * ace/ATM_Params.h, ATM_QoS.{h,i}:
+          Cleaned up comments, removed ACE_ATM_QoS::get_options_params
+          method (since it's not used), and made changes for UNIX build.
+
 Tue Oct 19 12:55:16 1999  Ossama Othman  <othman@cs.wustl.edu>
 
 	* ace/Codeset_IBM1047.h:
diff --git a/ace/ATM_Params.h b/ace/ATM_Params.h
index e6a6b0d3b11..42642670a7c 100644
--- a/ace/ATM_Params.h
+++ b/ace/ATM_Params.h
@@ -26,10 +26,12 @@
 
 #if defined (ACE_HAS_FORE_ATM_XTI)
 #include "ace/TLI.h"
+#define ATM_PROTOCOL_DEFAULT 0
 typedef struct t_info Param_Info;
 typedef struct netbuf Param_Udata;
 #elif defined (ACE_HAS_FORE_ATM_WS2)
 #include "ace/SOCK.h"
+#define ATM_PROTOCOL_DEFAULT ATMPROTO_AAL5
 #define ACE_XTI_ATM_DEVICE ""
 typedef int Param_Info;
 typedef int Param_Udata;
@@ -51,7 +53,7 @@ public:
                   Param_Udata *udata = 0,
                   int oflag = O_RDWR,
                   int protocol_family = AF_ATM,
-                  int protocol = ATMPROTO_AAL5,
+                  int protocol = ATM_PROTOCOL_DEFAULT,
                   int type = SOCK_RAW,
                   ACE_Protocol_Info *protocol_info = 0,
                   ACE_SOCK_GROUP g = 0,
diff --git a/ace/ATM_QoS.h b/ace/ATM_QoS.h
index 92f7007c554..84c183221fb 100644
--- a/ace/ATM_QoS.h
+++ b/ace/ATM_QoS.h
@@ -29,33 +29,6 @@
 // just map to WS2 GQOS struct
 typedef ACE_QoS ATM_QoS;
 #elif defined (ACE_HAS_FORE_ATM_XTI)
-// typedef enum {
-//   BEST_EFFORT,
-//   CONTROLLED_LOAD,
-//   GUARANTEED
-// } SERVICETYPE;
-
-// typedef struct _flowspec {
-//   int TokeRate;
-//   int TokenBucketSize;
-//   int PeakBandwidth;
-//   int Latency;
-//   int DelayVariation;
-//   SERVICETYPE ServiceType;
-//   int MaxSduSize;
-//   int MinimumPolicedSize;
-// } FLOWSPEC;
-
-// typedef struct _BUF {
-//   ulong len;
-//   char *buf;
-// } BUF;
-
-// typedef struct _QualityOfService {
-//   FLOWSPEC SendingFlowspec;
-//   FLOWSPEC ReceivingFlowspec;
-//   BUF ProviderSpecific;
-// } ATM_QoS;
 typedef struct netbuf ATM_QoS;
 #else
 typedef int ATM_QoS;
@@ -97,11 +70,8 @@ public:
   ATM_QoS get_qos (void);
   // Get ATM_QoS struct.
 
-  ACE_QoS_Params get_option_params( void );
-  // Get ACE QoS option parameters.
-
-	void dump (void) const;
-	// Dump the state of an object.
+  void dump (void) const;
+  // Dump the state of an object.
 
   ACE_ALLOC_HOOK_DECLARE;
   // Declare the dynamic allocation hooks.
diff --git a/ace/ATM_QoS.i b/ace/ATM_QoS.i
index dddfca2665e..ae38282fa44 100644
--- a/ace/ATM_QoS.i
+++ b/ace/ATM_QoS.i
@@ -21,12 +21,3 @@ ACE_ATM_QoS::get_qos (void)
   ACE_TRACE ("ACE_ATM_QoS::get_qos");
   return qos_;
 }
-
-ACE_INLINE
-ACE_QoS_Params
-ACE_ATM_QoS::get_option_params(void)
-{
-  ACE_TRACE( "ACE_ATM_QoS::get_option_params" );
-  return ACE_QoS_Params( 0, 0, &qos_, 0, 0 );
-}
-