From 182efcda7924aa1816ed6eb1f5d16a8ce514c66f Mon Sep 17 00:00:00 2001
From: Kris Kennaway <kris@FreeBSD.org>
Date: Fri, 18 Jul 2003 02:19:43 +0000
Subject: Fix build with gcc 3.3

---
 ...tch-classes::src::ArtsRttTimeSeriesTableData.cc | 32 ++++++++++++++--------
 1 file changed, 20 insertions(+), 12 deletions(-)

(limited to 'net-mgmt/arts++')

diff --git a/net-mgmt/arts++/files/patch-classes::src::ArtsRttTimeSeriesTableData.cc b/net-mgmt/arts++/files/patch-classes::src::ArtsRttTimeSeriesTableData.cc
index 50cfdab40c65..dd45bc91abac 100644
--- a/net-mgmt/arts++/files/patch-classes::src::ArtsRttTimeSeriesTableData.cc
+++ b/net-mgmt/arts++/files/patch-classes::src::ArtsRttTimeSeriesTableData.cc
@@ -1,6 +1,14 @@
 --- classes/src/ArtsRttTimeSeriesTableData.cc.orig	Thu Oct 19 16:37:14 2000
-+++ classes/src/ArtsRttTimeSeriesTableData.cc	Thu Jul 17 19:17:37 2003
-@@ -192,7 +192,7 @@
++++ classes/src/ArtsRttTimeSeriesTableData.cc	Thu Jul 17 19:19:28 2003
+@@ -47,6 +47,7 @@
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+ #include <time.h>
++#include <assert.h>
+ }
+ 
+ #include <string>
+@@ -192,7 +193,7 @@
  ostream & ArtsRttTimeSeriesTableEntry::write(ostream & os,
                                               uint32_t timeBase,
                                               uint32_t prevSecsOffset,
@@ -9,7 +17,7 @@
  {
    uint8_t         rleFlags = 0;
    uint8_t         timestampSecsLength = 0;
-@@ -217,7 +217,7 @@
+@@ -217,7 +218,7 @@
  
    timestampUsecsLength = BytesNeededForUint32(this->_timestamp.tv_usec);
    rleFlags |= (timestampUsecsLength - 1);
@@ -18,7 +26,7 @@
    if (rttLength > 0)
      g_ArtsLibInternal_Primitive.WriteUint32(os,this->_rtt,rttLength);
    if (timestampSecsLength > 0)
-@@ -232,14 +232,14 @@
+@@ -232,14 +233,14 @@
  //     int ArtsRttTimeSeriesTableEntry::write(int fd, 
  //                                            uint32_t timeBase, 
  //                                            uint32_t prevSecsOffset, 
@@ -35,7 +43,7 @@
  {
    uint8_t         rleFlags = 0;
    uint8_t         timestampSecsLength = 0;
-@@ -302,7 +302,7 @@
+@@ -302,7 +303,7 @@
  //----------------------------------------------------------------------------
  uint32_t ArtsRttTimeSeriesTableEntry::Length(uint32_t timeBase,
                                               uint32_t prevSecsOffset,
@@ -44,7 +52,7 @@
  {
    uint32_t length = sizeof(uint8_t);  // always have rleFlags
    if (this->_rtt != k_droppedPacketRtt) {
-@@ -330,13 +330,13 @@
+@@ -330,13 +331,13 @@
  istream & ArtsRttTimeSeriesTableEntry::read(istream & is,
                                              uint32_t timeBase,
                                              uint32_t prevSecsOffset,
@@ -60,7 +68,7 @@
  
    if (rleFlags & 0x80) {
      //  it's a dropped packet; RTT length is 0
-@@ -374,7 +374,7 @@
+@@ -374,7 +375,7 @@
  //----------------------------------------------------------------------------
  int ArtsRttTimeSeriesTableEntry::read(int fd, uint32_t timeBase,
                                        uint32_t prevSecsOffset,
@@ -69,7 +77,7 @@
  {
    uint8_t         rleFlags = 0;
    uint8_t         timestampUsecsLength = 0;
-@@ -594,7 +594,7 @@
+@@ -594,7 +595,7 @@
  //............................................................................
  //  
  //----------------------------------------------------------------------------
@@ -78,7 +86,7 @@
  {
    uint32_t numRttEntries, rttEntryNum;
    ArtsRttTimeSeriesTableEntry  rttEntry;
-@@ -623,7 +623,7 @@
+@@ -623,7 +624,7 @@
  //............................................................................
  //  
  //----------------------------------------------------------------------------
@@ -87,7 +95,7 @@
  {
    uint32_t numRttEntries, rttEntryNum;
    ArtsRttTimeSeriesTableEntry  rttEntry;
-@@ -664,7 +664,7 @@
+@@ -664,7 +665,7 @@
  //............................................................................
  //  
  //----------------------------------------------------------------------------
@@ -96,7 +104,7 @@
  {
    uint32_t    length = 0;
    uint32_t    rttEntryNum, numRttEntries;
-@@ -693,7 +693,7 @@
+@@ -693,7 +694,7 @@
  //  
  //----------------------------------------------------------------------------
  ostream & ArtsRttTimeSeriesTableData::write(ostream & os,
@@ -105,7 +113,7 @@
  {
    uint32_t             numRttEntries, rttEntryNum;
    uint32_t             rttUsecs;
-@@ -729,7 +729,7 @@
+@@ -729,7 +730,7 @@
  //............................................................................
  //  
  //----------------------------------------------------------------------------
-- 
cgit v1.2.3