i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GCC 4 fixes.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@20455 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2007-03-28 21:14:40 +00:00
parent b03e2464e6
commit 9449be79e7
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bin/strace/NetworkTypes.cpp
+8 -2
View File
@@ -12,12 +12,18 @@
#include <sys/socket.h> #include <sys/socket.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <map>
#include <utility>
#include <net_stack_driver.h> #include <net_stack_driver.h>
#include "Context.h" #include "Context.h"
#include "MemoryReader.h" #include "MemoryReader.h"
#include "TypeHandler.h" #include "TypeHandler.h"
using std::map;
using std::pair;
template<typename Type> template<typename Type>
static bool static bool
obtain_pointer_data(Context &context, Type *data, void *address, uint32 what) obtain_pointer_data(Context &context, Type *data, void *address, uint32 what)
@@ -292,7 +298,7 @@ public:
{ {
for (int i = 0; kSocketOptions[i].name != NULL; i++) { for (int i = 0; kSocketOptions[i].name != NULL; i++) {
fMap.insert(make_pair( fMap.insert(make_pair(
make_pair(kSocketOptions[i].level, std::make_pair(kSocketOptions[i].level,
kSocketOptions[i].option), kSocketOptions[i].option),
&kSocketOptions[i])); &kSocketOptions[i]));
} }
@@ -300,7 +306,7 @@ public:
const socket_option_info *GetEntry(int level, int option) const const socket_option_info *GetEntry(int level, int option) const
{ {
ThisMap::const_iterator i = fMap.find(make_pair(level, option)); ThisMap::const_iterator i = fMap.find(std::make_pair(level, option));
if (i == fMap.end()) if (i == fMap.end())
return NULL; return NULL;