From eff61480cc06e810999a87aeecb820ce25c42f51 Mon Sep 17 00:00:00 2001
From: Michael Lotz <mmlr@mlotz.ch>
Date: Fri, 23 Jan 2009 01:21:27 +0000
Subject: [PATCH] Fix header and add std namespace to nothrow.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@28985 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/add-ons/kernel/file_systems/userlandfs/shared/String.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/add-ons/kernel/file_systems/userlandfs/shared/String.cpp b/src/add-ons/kernel/file_systems/userlandfs/shared/String.cpp
index 5b9af20d7b..966b7cdd22 100644
--- a/src/add-ons/kernel/file_systems/userlandfs/shared/String.cpp
+++ b/src/add-ons/kernel/file_systems/userlandfs/shared/String.cpp
@@ -1,6 +1,6 @@
 // String.cpp
 
-#include <new.h>
+#include <new>
 #include <string.h>
 
 #include "String.h"
@@ -132,7 +132,7 @@ String::_SetTo(const char *string, int32 length)
 	bool result = true;
 	Unset();
 	if (string && length > 0) {
-		fString = new(nothrow) char[length + 1];
+		fString = new(std::nothrow) char[length + 1];
 		if (fString) {
 			memcpy(fString, string, length);
 			fString[length] = '\0';