Changeset 5533 in orxonox.OLD

Timestamp:

Nov 10, 2005, 5:45:25 PM (18 years ago)

Author:

patrick

Message:

network: some small changes in the comments and formatting in makefile.am

Location:

branches/network/src/lib/network

Files:

• Makefile.am (modified) (2 diffs)
• Makefile.in (modified) (3 diffs)
• network_manager.h (modified) (2 diffs)
• network_socket.h (modified) (1 diff)

branches/network/src/lib/network/Makefile.am

@@ -2 +2 @@
 include $(MAINSRCDIR)/defs/include_paths.am
 
-noinst_LIBRARIES = libORXnet.a 
+noinst_LIBRARIES = libORXnet.a
 
 libORXnet_a_SOURCES = synchronizeable.cc \
-                                                                network_manager.cc \
-                                                                network_socket.cc \
-                                                                connection_monitor.cc
+                      network_manager.cc \
+                      network_socket.cc \
+                      connection_monitor.cc
 
 
@@ -13 +13 @@
 noinst_HEADERS = synchronizeable.h \
                  network_manager.h \
-                                 network_socket.h \
+                 network_socket.h \
                  connection_monitor.h
 

branches/network/src/lib/network/Makefile.in

@@ -55 +55 @@
 libORXnet_a_LIBADD =
 am_libORXnet_a_OBJECTS = synchronizeable.$(OBJEXT) \
-        network_manager.$(OBJEXT) connection_monitor.$(OBJEXT)
+        network_manager.$(OBJEXT) network_socket.$(OBJEXT) \
+        connection_monitor.$(OBJEXT)
 libORXnet_a_OBJECTS = $(am_libORXnet_a_OBJECTS)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
@@ -182 +183 @@
 target_vendor = @target_vendor@
 MAINSRCDIR = ../..
-noinst_LIBRARIES = libORXnet.a 
+noinst_LIBRARIES = libORXnet.a
 libORXnet_a_SOURCES = synchronizeable.cc \
-                      network_manager.cc \
+                      network_manager.cc \
+                      network_socket.cc \
                       connection_monitor.cc
 
 noinst_HEADERS = synchronizeable.h \
-                     network_manager.h \
-                     connection_monitor.h
+                 network_manager.h \
+                 network_socket.h \
+                 connection_monitor.h
 
 all: all-am
@@ -240 +243 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/connection_monitor.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/network_manager.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/network_socket.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/synchronizeable.Po@am__quote@
 

branches/network/src/lib/network/network_manager.h

@@ -5 +5 @@
 */
 
+/* you will want to add such a a line at your header file also, since it will
+   prevent c++ from including your code twice*/
 #ifndef _NETWORK_MANGER
 #define _NETWORK_MANAGER
 
+
+/* include base_object.h since all classes are derived from this one */
 #include "base_object.h"
 
@@ -19 +23 @@
   NetworkManager();
   ~NetworkManager();
- 
+
   void initialize();
   void shutdown();
   void establishConnection(/* address, port, object reference*/);
   void shutdownConnection();
-  
+
   void registerListener();
   void synchronize();
-  
+
 };
 

branches/network/src/lib/network/network_socket.h

@@ -16 +16 @@
   NetworkSocket();
   ~NetworkSocket();
- 
+
   void connectToServer();
   void listen();
   void disconnectServer();
   void writeBytes();
-        void readBytes();
-  
+        void readBytes();
+
 };