Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5614 in orxonox.OLD for branches/network


Ignore:
Timestamp:
Nov 16, 2005, 4:45:12 PM (19 years ago)
Author:
rennerc
Message:

network_socket: changed argument types

Location:
branches/network
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/network/Makefile.am

    r5599 r5614  
    2828include doc/documentation.am
    2929endif
    30 <<<<<<< .mine
    31 _SOURCES = network_protocol.cc
    32 =======
    33 _SOURCES = network_manager.cc
    34 >>>>>>> .r5589
  • branches/network/src/lib/network/Makefile.in

    r5580 r5614  
    5757        network_manager.$(OBJEXT) network_socket.$(OBJEXT) \
    5858        connection_monitor.$(OBJEXT) network_stream.$(OBJEXT) \
    59         data_stream.$(OBJEXT)
     59        data_stream.$(OBJEXT) network_protocol.$(OBJEXT)
    6060libORXnet_a_OBJECTS = $(am_libORXnet_a_OBJECTS)
    6161DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
     
    190190                      connection_monitor.cc \
    191191                      network_stream.cc \
    192                       data_stream.cc
     192                      data_stream.cc \
     193                      network_protocol.cc
    193194
    194195noinst_HEADERS = synchronizeable.h \
     
    197198                 connection_monitor.h \
    198199                 network_stream.h \
    199                  data_stream.h
     200                 data_stream.h \
     201                 network_protocol.h
    200202
    201203all: all-am
     
    249251@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/data_stream.Po@am__quote@
    250252@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/network_manager.Po@am__quote@
     253@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/network_protocol.Po@am__quote@
    251254@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/network_socket.Po@am__quote@
    252255@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/network_stream.Po@am__quote@
  • branches/network/src/lib/network/network_socket.cc

    r5606 r5614  
    102102  * warnings
    103103  */
    104 void NetworkSocket::writeBytes(byte* data)
     104int NetworkSocket::writeBytes(byte* data, int length)
    105105{
    106106}
     
    113113  * From outside, the thread shouldn't be accessible at all.
    114114  */
    115 byte* NetworkSocket::readBytes()
     115int NetworkSocket::readBytes(byte * data, int length)
    116116{
    117117}
  • branches/network/src/lib/network/network_socket.h

    r5592 r5614  
    3535  void listen(unsigned int port);
    3636  void disconnectServer();
    37   void writeBytes(byte* data);
    38   byte* readBytes();
     37  int writeBytes(byte * data, int length);
     38  int readBytes(byte * data, int length);
    3939
    4040};
Note: See TracChangeset for help on using the changeset viewer.