From owner-freebsd-ports Sat Dec 14 23:20:10 2002 Delivered-To: freebsd-ports@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BBFAE37B401 for ; Sat, 14 Dec 2002 23:20:03 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id BAD8243EA9 for ; Sat, 14 Dec 2002 23:20:02 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id gBF7K2x3090679 for ; Sat, 14 Dec 2002 23:20:02 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id gBF7K2SH090678; Sat, 14 Dec 2002 23:20:02 -0800 (PST) Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B23FF37B401 for ; Sat, 14 Dec 2002 23:13:49 -0800 (PST) Received: from kcwu.dyndns.org (u142-187.u61-70.giga.net.tw [61.70.142.187]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3513F43E4A for ; Sat, 14 Dec 2002 23:13:48 -0800 (PST) (envelope-from kcwu@kcwu.dyndns.org) Received: from kcwu.dyndns.org (m722 [127.0.0.1]) by kcwu.dyndns.org (8.12.6/8.12.6) with ESMTP id gBF7Db83039984 for ; Sun, 15 Dec 2002 15:13:38 +0800 (CST) (envelope-from kcwu@kcwu.dyndns.org) Received: (from kcwu@localhost) by kcwu.dyndns.org (8.12.6/8.12.6/Submit) id gBF7DWmw039983; Sun, 15 Dec 2002 15:13:32 +0800 (CST) Message-Id: <200212150713.gBF7DWmw039983@kcwu.dyndns.org> Date: Sun, 15 Dec 2002 15:13:32 +0800 (CST) From: Kuang-che Wu Reply-To: Kuang-che Wu To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/46267: Fix build on -current for net/netmap Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 46267 >Category: ports >Synopsis: Fix build on -current for net/netmap >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Dec 14 23:20:02 PST 2002 >Closed-Date: >Last-Modified: >Originator: Kuang-che Wu >Release: FreeBSD 5.0-CURRENT i386 >Organization: >Environment: System: FreeBSD m722 5.0-CURRENT FreeBSD 5.0-CURRENT #0: Tue Nov 26 18:00:18 CST 2002 root@m722:/usr/obj/usr/src/sys/M722 i386 >Description: Fix build on -current for net/netmap >How-To-Repeat: >Fix: diff -urN netmap/files/patch-belgolib::dirs.h netmap.new/files/patch-belgolib::dirs.h --- netmap/files/patch-belgolib::dirs.h Thu Jan 1 08:00:00 1970 +++ netmap.new/files/patch-belgolib::dirs.h Sun Dec 15 14:57:43 2002 @@ -0,0 +1,10 @@ +--- belgolib/dirs.h.orig Sun Dec 15 14:54:27 2002 ++++ belgolib/dirs.h Sun Dec 15 14:54:27 2002 +@@ -3,6 +3,7 @@ + // - Consider using vector instead of list's + + #include ++using namespace std; + + #ifndef __make_dep__ + #include diff -urN netmap/files/patch-belgolib::dirs_core.c netmap.new/files/patch-belgolib::dirs_core.c --- netmap/files/patch-belgolib::dirs_core.c Thu Jan 1 08:00:00 1970 +++ netmap.new/files/patch-belgolib::dirs_core.c Sun Dec 15 15:03:03 2002 @@ -0,0 +1,10 @@ +--- belgolib/dirs_core.c.orig Sun Dec 15 15:02:19 2002 ++++ belgolib/dirs_core.c Sun Dec 15 15:02:25 2002 +@@ -1,6 +1,6 @@ + #include "dirs_core.h" + +-Oinfo::Oinfo(const string& fname, int fmode=0) ++Oinfo::Oinfo(const string& fname, int fmode) + { + stat_info = new struct stat; + diff -urN netmap/files/patch-belgolib::dirs_core.h netmap.new/files/patch-belgolib::dirs_core.h --- netmap/files/patch-belgolib::dirs_core.h Thu Jan 1 08:00:00 1970 +++ netmap.new/files/patch-belgolib::dirs_core.h Sun Dec 15 15:03:26 2002 @@ -0,0 +1,10 @@ +--- belgolib/dirs_core.h.orig Wed Dec 19 07:46:22 2001 ++++ belgolib/dirs_core.h Sun Dec 15 15:01:06 2002 +@@ -4,6 +4,7 @@ + + #ifndef __make_dep__ + #include ++using namespace std; + #endif + + #ifndef __dirs_core_h__ diff -urN netmap/files/patch-belgolib::files.c netmap.new/files/patch-belgolib::files.c --- netmap/files/patch-belgolib::files.c Thu Jan 1 08:00:00 1970 +++ netmap.new/files/patch-belgolib::files.c Sun Dec 15 14:57:43 2002 @@ -0,0 +1,28 @@ +--- belgolib/files.c.orig Sun Dec 15 14:54:27 2002 ++++ belgolib/files.c Sun Dec 15 14:54:27 2002 +@@ -1,6 +1,7 @@ + #include + #include + #include ++#include + + #include "files.h" + #include "debug.h" +@@ -16,7 +17,7 @@ + + Infile::Infile() : ifstream() { } + +-Infile::Infile(const string& file_name, int mode, bool fatal) ++Infile::Infile(const string& file_name, std::_Ios_Openmode mode, bool fatal) + : ifstream(file_name.c_str(), mode) + { + +@@ -38,7 +39,7 @@ + } + + +-int Infile::Open(const string & file_name, int mode, bool fatal) ++int Infile::Open(const string & file_name, std::_Ios_Openmode mode, bool fatal) + { + + if(cdb>d_list) diff -urN netmap/files/patch-belgolib::files.h netmap.new/files/patch-belgolib::files.h --- netmap/files/patch-belgolib::files.h Thu Jan 1 08:00:00 1970 +++ netmap.new/files/patch-belgolib::files.h Sun Dec 15 14:57:43 2002 @@ -0,0 +1,19 @@ +--- belgolib/files.h.orig Sun Dec 15 14:54:27 2002 ++++ belgolib/files.h Sun Dec 15 14:54:27 2002 +@@ -1,4 +1,5 @@ + #include ++using namespace std; + + #ifndef __make_dep__ + #include //makedepend bug +@@ -15,8 +16,8 @@ + class Infile : public ifstream { + public: + Infile(); +- Infile(const string &, int mode=ios::in, bool=false); +- int Open(const string &, int mode=ios::in, bool=false); ++ Infile(const string &, std::_Ios_Openmode mode=ios::in, bool=false); ++ int Open(const string &, std::_Ios_Openmode mode=ios::in, bool=false); + + protected: + int check_open() const; diff -urN netmap/files/patch-belgolib::search.c netmap.new/files/patch-belgolib::search.c --- netmap/files/patch-belgolib::search.c Thu Jan 1 08:00:00 1970 +++ netmap.new/files/patch-belgolib::search.c Sun Dec 15 14:57:43 2002 @@ -0,0 +1,11 @@ +--- belgolib/search.c.orig Sun Dec 15 14:54:27 2002 ++++ belgolib/search.c Sun Dec 15 14:54:27 2002 +@@ -5,7 +5,7 @@ + // SearchPath members + + +-void SearchPath::add_dir(const list& dlist, int depth = 0) ++void SearchPath::add_dir(const list& dlist, int depth) + { + for(CSiter diter = dlist.begin(); diter != dlist.end(); diter++) + add_dir( *diter, depth); diff -urN netmap/files/patch-makelist::config.h netmap.new/files/patch-makelist::config.h --- netmap/files/patch-makelist::config.h Thu Jan 1 08:00:00 1970 +++ netmap.new/files/patch-makelist::config.h Sun Dec 15 14:56:56 2002 @@ -0,0 +1,10 @@ +--- makelist/config.h.orig Sun Dec 15 14:54:27 2002 ++++ makelist/config.h Sun Dec 15 14:54:27 2002 +@@ -2,6 +2,7 @@ + #define _config_h_ + + #include ++using namespace std; + + extern int par_traceroute; + diff -urN netmap/files/patch-netmap::config.h netmap.new/files/patch-netmap::config.h --- netmap/files/patch-netmap::config.h Thu Jan 1 08:00:00 1970 +++ netmap.new/files/patch-netmap::config.h Sun Dec 15 14:56:18 2002 @@ -0,0 +1,10 @@ +--- netmap/config.h.orig Sun Dec 15 14:54:26 2002 ++++ netmap/config.h Sun Dec 15 14:54:26 2002 +@@ -3,6 +3,7 @@ + + #include + #include ++using namespace std; + + const string version = "NetMap 0.1.2 20011221"; + diff -urN netmap/files/patch-netmap::lookup.c netmap.new/files/patch-netmap::lookup.c --- netmap/files/patch-netmap::lookup.c Sun Feb 10 03:19:47 2002 +++ netmap.new/files/patch-netmap::lookup.c Sun Dec 15 14:56:18 2002 @@ -1,5 +1,5 @@ ---- netmap/lookup.c.orig Sun Feb 10 02:57:26 2002 -+++ netmap/lookup.c Sun Feb 10 02:59:22 2002 +--- netmap/lookup.c.orig Sun Dec 15 14:54:26 2002 ++++ netmap/lookup.c Sun Dec 15 14:54:26 2002 @@ -1,6 +1,8 @@ #include #include @@ -9,3 +9,21 @@ #include //hostent def //from belgolib +@@ -83,7 +85,7 @@ + if(verbose_lvl) + cout << indent(2) << "Reading " << fname << endl; + +- Infile cfile(fname, ios::bin | ios::in); ++ Infile cfile(fname, ios::binary | ios::in); + + while(cfile && !cfile.eof()) { + HostRec hr; +@@ -229,7 +231,7 @@ + + void LookUp::read_failedip(const string& fname) + { +- Infile cfile(fname, ios::bin | ios::in); ++ Infile cfile(fname, ios::binary | ios::in); + + while(cfile && !cfile.eof()) { + string ip; diff -urN netmap/files/patch-netmap::misc.c netmap.new/files/patch-netmap::misc.c --- netmap/files/patch-netmap::misc.c Thu Jan 1 08:00:00 1970 +++ netmap.new/files/patch-netmap::misc.c Sun Dec 15 14:56:18 2002 @@ -0,0 +1,11 @@ +--- netmap/misc.c.orig Sun Dec 15 14:54:26 2002 ++++ netmap/misc.c Sun Dec 15 14:54:26 2002 +@@ -54,7 +54,7 @@ + return false; + + bool had_point = false; +- int beyond_point = 0; ++ unsigned int beyond_point = 0; + + int int_first = 0; + for(unsigned i = 0; i < str.length(); i++) { diff -urN netmap/files/patch-netmap::misc.h netmap.new/files/patch-netmap::misc.h --- netmap/files/patch-netmap::misc.h Thu Jan 1 08:00:00 1970 +++ netmap.new/files/patch-netmap::misc.h Sun Dec 15 14:56:18 2002 @@ -0,0 +1,10 @@ +--- netmap/misc.h.orig Sun Dec 15 14:54:26 2002 ++++ netmap/misc.h Sun Dec 15 14:54:26 2002 +@@ -6,6 +6,7 @@ + #include + + #include ++using namespace std; + + + string indent(unsigned); diff -urN netmap/files/patch-netmap::netmap.c netmap.new/files/patch-netmap::netmap.c --- netmap/files/patch-netmap::netmap.c Thu Jan 1 08:00:00 1970 +++ netmap.new/files/patch-netmap::netmap.c Sun Dec 15 14:56:18 2002 @@ -0,0 +1,20 @@ +--- netmap/netmap.c.orig Sun Dec 15 14:54:26 2002 ++++ netmap/netmap.c Sun Dec 15 14:54:26 2002 +@@ -32,7 +32,7 @@ + + int count_invalid_hosts(const string& fname) + { +- Infile inf(fname, ios::bin | ios::in); ++ Infile inf(fname, ios::binary | ios::in); + + int invalid_hosts = 0; + int invalid_left = 0; +@@ -60,7 +60,7 @@ + const int num_invalid_hosts = + (keep_reading?count_invalid_hosts(fname):0); + +- Infile inf(fname, ios::bin | ios::in); ++ Infile inf(fname, ios::binary | ios::in); + + int mark_first = 1; + string prev_addr = inv_ip; >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message