hrev51139 adds 2 changesets to branch 'master'
old head: 2d8adbdd85635241b755fd3cc950f2cbb175a9da
new head: 4c3f62c894017fe67f87b453731d83881e116706
overview:
http://cgit.haiku-os.org/haiku/log/?qt=range&q=4c3f62c89401+%5E2d8adbdd8563
----------------------------------------------------------------------------
afd07b56212c: KPathTest: Fixed build with gcc 5.
4c3f62c89401: cppunit: Fixed build with gcc 5 on Haiku.
[ Axel Dörfler <axeld@xxxxxxxxxxxxxxxx> ]
----------------------------------------------------------------------------
2 files changed, 10 insertions(+), 8 deletions(-)
src/tests/system/kernel/fs/KPathTest.cpp | 2 ++
src/tools/cppunit/TestShell.cpp | 16 ++++++++--------
############################################################################
Commit: afd07b56212c2e3a8b8374f0a182b03ea9a344d3
URL: http://cgit.haiku-os.org/haiku/commit/?id=afd07b56212c
Author: Axel Dörfler <axeld@xxxxxxxxxxxxxxxx>
Date: Sat Apr 29 19:53:36 2017 UTC
KPathTest: Fixed build with gcc 5.
----------------------------------------------------------------------------
diff --git a/src/tests/system/kernel/fs/KPathTest.cpp
b/src/tests/system/kernel/fs/KPathTest.cpp
index dfb788b..3108478 100644
--- a/src/tests/system/kernel/fs/KPathTest.cpp
+++ b/src/tests/system/kernel/fs/KPathTest.cpp
@@ -6,6 +6,8 @@
#include "KPathTest.h"
+#include <string.h>
+
#include <fs/KPath.h>
#include <cppunit/TestCaller.h>
############################################################################
Revision: hrev51139
Commit: 4c3f62c894017fe67f87b453731d83881e116706
URL: http://cgit.haiku-os.org/haiku/commit/?id=4c3f62c89401
Author: Axel Dörfler <axeld@xxxxxxxxxxxxxxxx>
Date: Sat Apr 29 19:53:59 2017 UTC
cppunit: Fixed build with gcc 5 on Haiku.
----------------------------------------------------------------------------
diff --git a/src/tools/cppunit/TestShell.cpp b/src/tools/cppunit/TestShell.cpp
index 1cbf482..9d48238 100644
--- a/src/tools/cppunit/TestShell.cpp
+++ b/src/tools/cppunit/TestShell.cpp
@@ -37,7 +37,7 @@ BTestShell::BTestShell(const string &description, SyncObject
*syncObject)
, fListTestsAndExit(false)
, fTestDir(NULL)
#ifndef NO_ELF_SYMBOL_PATCHING
- , fPatchGroupLocker(new(nothrow) BLocker)
+ , fPatchGroupLocker(new BLocker)
, fPatchGroup(NULL)
, fOldDebuggerHook(NULL)
, fOldLoadAddOnHook(NULL)
@@ -496,20 +496,20 @@ BTestShell::InstallPatches()
{
#ifndef NO_ELF_SYMBOL_PATCHING
if (fPatchGroup) {
- cerr << "BTestShell::InstallPatches(): Patch group already
exist!"
+ std::cerr << "BTestShell::InstallPatches(): Patch group already
exist!"
<< endl;
return;
}
BAutolock locker(fPatchGroupLocker);
if (!locker.IsLocked()) {
- cerr << "BTestShell::InstallPatches(): Failed to acquire patch "
+ std::cerr << "BTestShell::InstallPatches(): Failed to acquire
patch "
"group lock!" << endl;
return;
}
- fPatchGroup = new(nothrow) ElfSymbolPatchGroup;
+ fPatchGroup = new(std::nothrow) ElfSymbolPatchGroup;
// init the symbol patch group
if (!fPatchGroup) {
- cerr << "BTestShell::InstallPatches(): Failed to allocate patch
"
+ std::cerr << "BTestShell::InstallPatches(): Failed to allocate
patch "
"group!" << endl;
return;
}
@@ -526,8 +526,8 @@ BTestShell::InstallPatches()
// everything went fine
fPatchGroup->Patch();
} else {
- cerr << "BTestShell::InstallPatches(): Failed to patch all
symbols!"
- << endl;
+ std::cerr << "BTestShell::InstallPatches(): Failed to patch all
"
+ "symbols!" << endl;
UninstallPatches();
}
#endif // ! NO_ELF_SYMBOL_PATCHING
@@ -543,7 +543,7 @@ BTestShell::UninstallPatches()
#ifndef NO_ELF_SYMBOL_PATCHING
BAutolock locker(fPatchGroupLocker);
if (!locker.IsLocked()) {
- cerr << "BTestShell::UninstallPatches(): "
+ std::cerr << "BTestShell::UninstallPatches(): "
"Failed to acquire patch group lock!" << endl;
return;
}
