Changeset 5569 in orxonox.OLD

Timestamp:

Nov 15, 2005, 9:13:32 AM (18 years ago)

Author:

patrick

Message:

network: some very small changes on the DataStream (because I got the UML Diagram wrong), to make it compile under linux

Location:

branches/network/src/lib/network

Files:

• data_stream.cc (modified) (9 diffs)
• data_stream.h (modified) (2 diffs)

branches/network/src/lib/network/data_stream.cc

@@ -28 +28 @@
  */
 DataStream::DataStream(DataStream& upStream, DataStream& downStream)
-{ 
-     
+{
+
 }
 
@@ -37 +37 @@
 DataStream::DataStream(Synchronizeable& sync, NetworkSocket& socket)
 {
- 
+
 }
 
@@ -45 +45 @@
 DataStream::~DataStream()
 {
-     
+
 }
 
 /**
- * This function connects this stream to another stream. The connected DataStream is an up-stream, meaning 
+ * This function connects this stream to another stream. The connected DataStream is an up-stream, meaning
  * that the stream is "further away" from the NetworkSocket. The local reference upStream will be set to this
  * Stream
@@ -55 +55 @@
 void DataStream::connectUpStream(DataStream& upStream)
 {
-     
+
 }
 
 /**
- * This function connects this stream to another stream. The connected DataStream is an down-stream, meaning 
+ * This function connects this stream to another stream. The connected DataStream is an down-stream, meaning
  * that the stream is "closer" to the NetworkSocket.
  */
 void DataStream::connectDownStream(DataStream& upStream)
 {
-     
+
 }
 
@@ -72 +72 @@
 void DataStream::disconnectUpStream()
 {
-     
+
 }
 
@@ -80 +80 @@
 void DataStream::disconnectDownStream()
 {
-     
+
 }
 
@@ -89 +89 @@
 void DataStream::processData()
 {
-     
+
 }
 
@@ -97 +97 @@
  * it.
  */
-void DataStream::write()
+void DataStream::write(byte& data)
 {
-     
+
 }
 
@@ -110 +110 @@
 byte& DataStream::read()
 {
-     
+
 }

branches/network/src/lib/network/data_stream.h

@@ -13 +13 @@
 #include "netdefs.h"
 
+class Synchronizeable;
+class NetworkSocket;
+
 class DataStream : public BaseObject
 {
@@ -18 +21 @@
       DataStream(Synchronizeable& sync, NetworkSocket& socket);
       ~DataStream();
-      
-      protected: 
+
+      protected:
       byte inBuffer [];
       byte outBuffer [];
       unsigned int bufferSize;
-      DataStream& upStream;
-      DataStream& downStream;
-      
+      DataStream* upStream;
+      DataStream* downStream;
+
       public:
       void connectUpStream(DataStream& upStream);
-      
+
       void disconnectUpStream();
-      
+
       void connectDownStream(DataStream& downStream);
-      
+
       void disconnectDownStream();
-      
+
       virtual void processData() = 0;
-      
+
       protected:
       void write(byte& data);
-      
-      byte& read();      
+
+      byte& read();
 };