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

* gcc4 build fix

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@24756 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Karsten Heimrich
2008-04-02 19:17:59 +00:00
parent 9da0e4408d
commit e1a5b29760
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/libroot/posix/grp.cpp
+2 -1
View File
@@ -6,6 +6,7 @@
#include <grp.h> #include <grp.h>
#include <errno.h> #include <errno.h>
#include <string.h>
#include <unistd.h> #include <unistd.h>
#include <new> #include <new>
@@ -108,7 +109,7 @@ init_group_db()
if (sGroupDB != NULL) if (sGroupDB != NULL)
return sGroupDB; return sGroupDB;
sGroupDB = new(nothrow) GroupDB; sGroupDB = new(std::nothrow) GroupDB;
if (sGroupDB == NULL) if (sGroupDB == NULL)
return NULL; return NULL;
src/system/libroot/posix/pwd.cpp
+2 -1
View File
@@ -6,6 +6,7 @@
#include <pwd.h> #include <pwd.h>
#include <errno.h> #include <errno.h>
#include <string.h>
#include <unistd.h> #include <unistd.h>
#include <new> #include <new>
@@ -73,7 +74,7 @@ init_passwd_db()
if (sPasswdDB != NULL) if (sPasswdDB != NULL)
return sPasswdDB; return sPasswdDB;
sPasswdDB = new(nothrow) PasswdDB; sPasswdDB = new(std::nothrow) PasswdDB;
if (sPasswdDB == NULL) if (sPasswdDB == NULL)
return NULL; return NULL;
src/system/libroot/posix/user_group_common.cpp
+2 -2
View File
@@ -520,7 +520,7 @@ status_t
PasswdDB::HandleEntry(const char* name, const char* password, uid_t uid, PasswdDB::HandleEntry(const char* name, const char* password, uid_t uid,
gid_t gid, const char* home, const char* shell, const char* realName) gid_t gid, const char* home, const char* shell, const char* realName)
{ {
PasswdDBEntry* entry = new(nothrow) PasswdDBEntry(); PasswdDBEntry* entry = new(std::nothrow) PasswdDBEntry();
if (entry == NULL || !entry->Init(name, password, uid, gid, home, shell, if (entry == NULL || !entry->Init(name, password, uid, gid, home, shell,
realName)) { realName)) {
delete entry; delete entry;
@@ -692,7 +692,7 @@ status_t
GroupDB::HandleEntry(const char* name, const char* password, gid_t gid, GroupDB::HandleEntry(const char* name, const char* password, gid_t gid,
const char* const* members, int memberCount) const char* const* members, int memberCount)
{ {
GroupDBEntry* entry = new(nothrow) GroupDBEntry(); GroupDBEntry* entry = new(std::nothrow) GroupDBEntry();
if (entry == NULL || !entry->Init(name, password, gid, members, if (entry == NULL || !entry->Init(name, password, gid, members,
memberCount)) { memberCount)) {
delete entry; delete entry;