View | Details | Raw Unified | Return to bug 46267
Collapse All | Expand All

(-)netmap.new/files/patch-belgolib::dirs.h (+10 lines)
Line 0 Link Here
1 
--- belgolib/dirs.h.orig	Sun Dec 15 14:54:27 2002
2 
+++ belgolib/dirs.h	Sun Dec 15 14:54:27 2002
3 
@@ -3,6 +3,7 @@
4 
 //   - Consider using vector instead of list<T*>'s
5
6 
 #include <list>
7 
+using namespace std;
8
9 
 #ifndef __make_dep__
10 
 #include <string>
(-)netmap.new/files/patch-belgolib::dirs_core.c (+10 lines)
Line 0 Link Here
1 
--- belgolib/dirs_core.c.orig	Sun Dec 15 15:02:19 2002
2 
+++ belgolib/dirs_core.c	Sun Dec 15 15:02:25 2002
3 
@@ -1,6 +1,6 @@
4 
 #include "dirs_core.h"
5
6 
-Oinfo::Oinfo(const string& fname, int fmode=0)
7 
+Oinfo::Oinfo(const string& fname, int fmode)
8 
 {
9 
     stat_info = new struct stat;
10
(-)netmap.new/files/patch-belgolib::dirs_core.h (+10 lines)
Line 0 Link Here
1 
--- belgolib/dirs_core.h.orig	Wed Dec 19 07:46:22 2001
2 
+++ belgolib/dirs_core.h	Sun Dec 15 15:01:06 2002
3 
@@ -4,6 +4,7 @@
4
5 
 #ifndef __make_dep__
6 
 #include <string>
7 
+using namespace std;
8 
 #endif
9
10 
 #ifndef __dirs_core_h__
(-)netmap.new/files/patch-belgolib::files.c (+28 lines)
Line 0 Link Here
1 
--- belgolib/files.c.orig	Sun Dec 15 14:54:27 2002
2 
+++ belgolib/files.c	Sun Dec 15 14:54:27 2002
3 
@@ -1,6 +1,7 @@
4 
 #include <errno.h>
5 
 #include <stdio.h>
6 
 #include <assert.h>
7 
+#include <iostream>
8
9 
 #include "files.h"
10 
 #include "debug.h"
11 
@@ -16,7 +17,7 @@
12
13 
 Infile::Infile() : ifstream() { }
14
15 
-Infile::Infile(const string& file_name, int mode, bool fatal)
16 
+Infile::Infile(const string& file_name, std::_Ios_Openmode mode, bool fatal)
17 
     : ifstream(file_name.c_str(), mode)
18 
 {
19
20 
@@ -38,7 +39,7 @@
21 
 }
22
23
24 
-int Infile::Open(const string & file_name, int mode, bool fatal)
25 
+int Infile::Open(const string & file_name, std::_Ios_Openmode mode, bool fatal)
26 
 {
27
28 
     if(cdb>d_list)
(-)netmap.new/files/patch-belgolib::files.h (+19 lines)
Line 0 Link Here
1 
--- belgolib/files.h.orig	Sun Dec 15 14:54:27 2002
2 
+++ belgolib/files.h	Sun Dec 15 14:54:27 2002
3 
@@ -1,4 +1,5 @@
4 
 #include <fstream>
5 
+using namespace std;
6
7 
 #ifndef __make_dep__
8 
 #include <string>  //makedepend bug
9 
@@ -15,8 +16,8 @@
10 
 class Infile : public ifstream  {
11 
 public:
12 
     Infile();
13 
-    Infile(const string &, int mode=ios::in, bool=false);
14 
-    int Open(const string &, int mode=ios::in, bool=false);
15 
+    Infile(const string &, std::_Ios_Openmode mode=ios::in, bool=false);
16 
+    int Open(const string &, std::_Ios_Openmode mode=ios::in, bool=false);
17
18 
 protected:
19 
     int check_open() const;
(-)netmap.new/files/patch-belgolib::search.c (+11 lines)
Line 0 Link Here
1 
--- belgolib/search.c.orig	Sun Dec 15 14:54:27 2002
2 
+++ belgolib/search.c	Sun Dec 15 14:54:27 2002
3 
@@ -5,7 +5,7 @@
4 
 // SearchPath members
5
6
7 
-void SearchPath::add_dir(const list<string>& dlist, int depth = 0)
8 
+void SearchPath::add_dir(const list<string>& dlist, int depth)
9 
 {
10 
     for(CSiter diter = dlist.begin(); diter != dlist.end(); diter++)
11 
 	add_dir( *diter, depth);
(-)netmap.new/files/patch-makelist::config.h (+10 lines)
Line 0 Link Here
1 
--- makelist/config.h.orig	Sun Dec 15 14:54:27 2002
2 
+++ makelist/config.h	Sun Dec 15 14:54:27 2002
3 
@@ -2,6 +2,7 @@
4 
 #define _config_h_
5
6 
 #include <string>
7 
+using namespace std;
8
9 
 extern int par_traceroute;
10
(-)netmap.new/files/patch-netmap::config.h (+10 lines)
Line 0 Link Here
1 
--- netmap/config.h.orig	Sun Dec 15 14:54:26 2002
2 
+++ netmap/config.h	Sun Dec 15 14:54:26 2002
3 
@@ -3,6 +3,7 @@
4
5 
 #include <list>
6 
 #include <string>
7 
+using namespace std;
8
9 
 const string version = "NetMap 0.1.2 20011221";
10
(-)netmap.new/files/patch-netmap::lookup.c (-2 / +20 lines)
Lines 1-5 Link Here
1 
--- netmap/lookup.c.orig	Sun Feb 10 02:57:26 2002
 1 
--- netmap/lookup.c.orig	Sun Dec 15 14:54:26 2002
2 
+++ netmap/lookup.c	Sun Feb 10 02:59:22 2002
 2 
+++ netmap/lookup.c	Sun Dec 15 14:54:26 2002
3 
@@ -1,6 +1,8 @@
 3 
@@ -1,6 +1,8 @@
4 
 #include <strstream>
 4 
 #include <strstream>
5 
 #include <iostream>
 5 
 #include <iostream>
Lines 9-11 Link Here
9 
 #include <netdb.h> 	//hostent def
 9 
 #include <netdb.h> 	//hostent def
10
10
11 
 //from belgolib
 11 
 //from belgolib
12 
@@ -83,7 +85,7 @@
13 
     if(verbose_lvl)
14 
 	cout << indent(2) << "Reading " << fname << endl;
15
16 
-    Infile cfile(fname, ios::bin | ios::in);
17 
+    Infile cfile(fname, ios::binary | ios::in);
18
19 
     while(cfile && !cfile.eof()) {
20 
 	HostRec hr;
21 
@@ -229,7 +231,7 @@
22
23 
 void LookUp::read_failedip(const string& fname)
24 
 {
25 
-    Infile cfile(fname, ios::bin | ios::in);
26 
+    Infile cfile(fname, ios::binary | ios::in);
27
28 
     while(cfile && !cfile.eof()) {
29 
 	string ip;
(-)netmap.new/files/patch-netmap::misc.c (+11 lines)
Line 0 Link Here
1 
--- netmap/misc.c.orig	Sun Dec 15 14:54:26 2002
2 
+++ netmap/misc.c	Sun Dec 15 14:54:26 2002
3 
@@ -54,7 +54,7 @@
4 
 	return false;
5
6 
     bool had_point = false;
7 
-    int beyond_point = 0;
8 
+    unsigned int beyond_point = 0;
9
10 
     int int_first = 0;
11 
     for(unsigned i = 0; i < str.length(); i++) {
(-)netmap.new/files/patch-netmap::misc.h (+10 lines)
Line 0 Link Here
1 
--- netmap/misc.h.orig	Sun Dec 15 14:54:26 2002
2 
+++ netmap/misc.h	Sun Dec 15 14:54:26 2002
3 
@@ -6,6 +6,7 @@
4 
 #include <iostream>
5
6 
 #include <list>
7 
+using namespace std;
8
9
10 
 string indent(unsigned);
(-)netmap.new/files/patch-netmap::netmap.c (+20 lines)
Line 0 Link Here
1 
--- netmap/netmap.c.orig	Sun Dec 15 14:54:26 2002
2 
+++ netmap/netmap.c	Sun Dec 15 14:54:26 2002
3 
@@ -32,7 +32,7 @@
4
5 
 int count_invalid_hosts(const string& fname)
6 
 {
7 
-    Infile inf(fname, ios::bin | ios::in);
8 
+    Infile inf(fname, ios::binary | ios::in);
9
10 
     int invalid_hosts = 0;
11 
     int invalid_left = 0;
12 
@@ -60,7 +60,7 @@
13 
     const int num_invalid_hosts =
14 
 	(keep_reading?count_invalid_hosts(fname):0);
15
16 
-    Infile inf(fname, ios::bin | ios::in);
17 
+    Infile inf(fname, ios::binary | ios::in);
18
19 
     int mark_first = 1;
20 
     string prev_addr = inv_ip;

Return to bug 46267