CERBERUS/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2026-08-27 03:48:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Get rid of "using namespace std".

Browse source 
This entails using names like std::vector and std::list rather than bare
vector and list, which was already the prevailing style. The immediate
cause of this is a header file on Solaris 10 that uses a "struct map"
that conflicts with std::map.

In file included from struct_ip.h:40:0,
                 from tcpip.cc:108:
/usr/include/net/if.h:99:9: error: template argument required for 'struct map'
This commit is contained in:
david 2012-03-19 16:48:27 +00:00
parent a85a47d816
commit 9698ccabaf
3 changed files with 23 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

10
FPEngine.cc
View file

@ -613,7 +613,7 @@ FPEngine::~FPEngine() {
*
* dst host fe80::250:56ff:fec0:1
*/
const char *FPEngine::bpf_filter(vector<Target *> &Targets) {
const char *FPEngine::bpf_filter(std::vector<Target *> &Targets) {
static char pcap_filter[2048];
/* 20 IPv6 addresses is max (46 byte addy + 14 (" or src host ")) * 20 == 1200 */
char dst_hosts[1220];
@ -1047,12 +1047,12 @@ static void classify(FingerPrintResultsIPv6 *FPR) {
* results and matching fingerprints. If everything goes well, the internal
* state of the supplied target objects will be modified to reflect the results
* of the */
int FPEngine6::os_scan(vector<Target *> &Targets) {
int FPEngine6::os_scan(std::vector<Target *> &Targets) {
bool osscan_done = false;
const char *bpf_filter = NULL;
vector<FPHost6 *> curr_hosts; /* Hosts currently doing OS detection */
vector<FPHost6 *> done_hosts; /* Hosts for which we already did OSdetect */
vector<FPHost6 *> left_hosts; /* Hosts we have not yet started with */
std::vector<FPHost6 *> curr_hosts; /* Hosts currently doing OS detection */
std::vector<FPHost6 *> done_hosts; /* Hosts for which we already did OSdetect */
std::vector<FPHost6 *> left_hosts; /* Hosts we have not yet started with */
struct timeval begin_time;
if (o.debugging)