gcc-3.1

2 files changed, 9 insertions, 9 deletions

diff --git a/src/Main.cc b/src/Main.cc
index caba9b6..d70c310 100644
--- a/src/Main.cc
+++ b/src/Main.cc
@@ -1,5 +1,5 @@
 #include <unistd.h>
-#include <list.h>
+#include <list>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include "Handle.h"
@@ -145,7 +145,7 @@ int main(int argc, char ** argv) {
     int c;
     String port = "1500";
     
-    list<String> testlist;
+    std::list<String> testlist;
     testlist.push_front("poide");
     
     in = new InPipe();
@@ -153,11 +153,11 @@ int main(int argc, char ** argv) {
     in->Hook();
     
     String test = "poide\n", r;
-    cout << test;
-    cout.flush();
+    std::cout << test;
+    std::cout.flush();
     (*in) >> r;
     if (r != "poide") {
-	cerr << "The stdout redirect has failed.\n";
+	std::cerr << "The stdout redirect has failed.\n";
 	exit(-1);
     }
     
@@ -167,7 +167,7 @@ int main(int argc, char ** argv) {
 	    port = optarg;
 	    break;
 	default:
-	    cerr << "Usage: " << argv[0] << " [-p port]\n";
+	    std::cerr << "Usage: " << argv[0] << " [-p port]\n";
 	    exit(-1);
 	}
     }
@@ -180,12 +180,12 @@ int main(int argc, char ** argv) {
 	TaskMan::MainLoop();
     }
     catch (GeneralException e) {
-	cerr << "Main function got an exception: '" << e.GetMsg() << "'.\n";
+	std::cerr << "Main function got an exception: '" << e.GetMsg() << "'.\n";
 	exit(-1);
     }
     
     catch (...) {
-	cerr << "Unknow exception.\n" << endl;
+	std::cerr << "Unknow exception.\n" << std::endl;
 	exit(-1);
     }
     
diff --git a/src/Makefile.am b/src/Makefile.am
index b63b25f..4ff7f55 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,7 +4,7 @@ localedir = $(datadir)/locale
 DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
 AM_CFLAGS = -O3 -Wall -Wstrict-prototypes
 AM_CXXFLAGS = -O3 -Wall -Wstrict-prototypes
-INCLUDES = -I. -I.. -I$(includedir) -I../include
+INCLUDES = -I../include -I$(includedir)
 
 bin_PROGRAMS = Baltisot