From 9449be79e7de37bc690c2cf2005421895d0b69a9 Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
Date: Wed, 28 Mar 2007 21:14:40 +0000
Subject: [PATCH] GCC 4 fixes.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@20455 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/bin/strace/NetworkTypes.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/bin/strace/NetworkTypes.cpp b/src/bin/strace/NetworkTypes.cpp
index 90e92eae89..66718af112 100644
--- a/src/bin/strace/NetworkTypes.cpp
+++ b/src/bin/strace/NetworkTypes.cpp
@@ -12,12 +12,18 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
 
+#include <map>
+#include <utility>
+
 #include <net_stack_driver.h>
 
 #include "Context.h"
 #include "MemoryReader.h"
 #include "TypeHandler.h"
 
+using std::map;
+using std::pair;
+
 template<typename Type>
 static bool
 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++) {
 			fMap.insert(make_pair(
-					make_pair(kSocketOptions[i].level,
+					std::make_pair(kSocketOptions[i].level,
 						  kSocketOptions[i].option),
 					&kSocketOptions[i]));
 		}
@@ -300,7 +306,7 @@ public:
 
 	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())
 			return NULL;