add more patches for net/cflowd but still not working properly under

-current / gcc 3.2.1.

Maybe somebody with more C++ knowledge can have a look at the current
errors it is stuck with?

2 files changed, 54 insertions, 0 deletions

diff --git a/net/cflowd/files/patch-classes::include::CflowdNetMatrixKey.hh b/net/cflowd/files/patch-classes::include::CflowdNetMatrixKey.hh
new file mode 100644
index 000000000000..3b3225191b57
--- /dev/null
+++ b/net/cflowd/files/patch-classes::include::CflowdNetMatrixKey.hh
@@ -0,0 +1,26 @@
+--- classes/include/CflowdNetMatrixKey.hh.orig	Fri Aug 29 20:35:27 2003
++++ classes/include/CflowdNetMatrixKey.hh	Fri Aug 29 20:36:00 2003
+@@ -191,9 +191,9 @@
+   inline istream & read(istream & is)
+   {
+     g_CfdArtsPrimitive.ReadIpv4Network(is,this->_src,sizeof(this->_src));
+-    is.read(&(this->_srcMaskLen),sizeof(this->_srcMaskLen));
++    is.read((char *)&(this->_srcMaskLen),sizeof(this->_srcMaskLen));
+     g_CfdArtsPrimitive.ReadIpv4Network(is,this->_dst,sizeof(this->_dst));
+-    is.read(&(this->_dstMaskLen),sizeof(this->_dstMaskLen));
++    is.read((char *)&(this->_dstMaskLen),sizeof(this->_dstMaskLen));
+     
+     return(is);
+   }
+@@ -263,9 +263,9 @@
+   inline ostream & write(ostream & os) const
+   {
+     g_CfdArtsPrimitive.WriteIpv4Network(os,this->_src,sizeof(this->_src));
+-    os.write(&(this->_srcMaskLen),sizeof(this->_srcMaskLen));
++    os.write((char *)&(this->_srcMaskLen),sizeof(this->_srcMaskLen));
+     g_CfdArtsPrimitive.WriteIpv4Network(os,this->_dst,sizeof(this->_dst));
+-    os.write(&(this->_dstMaskLen),sizeof(this->_dstMaskLen));
++    os.write((char *)&(this->_dstMaskLen),sizeof(this->_dstMaskLen));
+     return(os);
+   }
+   
diff --git a/net/cflowd/files/patch-classes::src::CflowdProtocolTable.cc b/net/cflowd/files/patch-classes::src::CflowdProtocolTable.cc
new file mode 100644
index 000000000000..e9c91b97b5c6
--- /dev/null
+++ b/net/cflowd/files/patch-classes::src::CflowdProtocolTable.cc
@@ -0,0 +1,28 @@
+--- classes/src/CflowdProtocolTable.cc.orig	Fri Aug 29 20:37:48 2003
++++ classes/src/CflowdProtocolTable.cc	Fri Aug 29 20:39:55 2003
+@@ -82,9 +82,9 @@
+     (*this).erase((*this).begin(),(*this).end());
+   }
+ 
+-  is.read(&numProtocols,sizeof(numProtocols));
++  is.read((char *)&numProtocols,sizeof(numProtocols));
+   for (protocolNum = 0; protocolNum < numProtocols; protocolNum++) {
+-    is.read(&protocol,sizeof(protocol));
++    is.read((char *)&protocol,sizeof(protocol));
+     protoTraffic.read(is);
+     (*this)[protocol] = protoTraffic;
+   }
+@@ -151,11 +151,11 @@
+   CflowdProtocolTable::const_iterator  protoIter;
+   
+   numProtocols = (*this).size();
+-  os.write(&numProtocols,sizeof(numProtocols));
++  os.write((char *)&numProtocols,sizeof(numProtocols));
+ 
+   for (protoIter = (*this).begin(); protoIter != (*this).end(); protoIter++) {
+     protocol = (*protoIter).first;
+-    os.write(&protocol,sizeof(protocol));
++    os.write((const char *)&protocol,sizeof(protocol));
+     (*protoIter).second.write(os);
+   }
+   return(os);