[haiku-commits] haiku: hrev43892 - in src/bin/bfs_tools/lib: . src/bin/bfs_tools
- From: revol@xxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Mon, 26 Mar 2012 23:23:16 +0200 (CEST)
hrev43892 adds 1 changeset to branch 'master'
old head: 647cff2e5925f2a1483b94aaff5620647ddf11bd
new head: a59d56fa3688bf331859d4d03273490c7b7b1bef
----------------------------------------------------------------------------
a59d56f: gcc4 build fixes.
[ François Revol <revol@xxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev43892
Commit: a59d56fa3688bf331859d4d03273490c7b7b1bef
URL: http://cgit.haiku-os.org/haiku/commit/?id=a59d56f
Author: François Revol <revol@xxxxxxx>
Date: Mon Mar 26 21:22:49 2012 UTC
----------------------------------------------------------------------------
6 files changed, 10 insertions(+), 4 deletions(-)
src/bin/bfs_tools/Jamfile | 2 +-
src/bin/bfs_tools/lib/BPlusTree.h | 4 +++-
src/bin/bfs_tools/lib/Cache.h | 2 ++
src/bin/bfs_tools/lib/Disk.cpp | 2 +-
src/bin/bfs_tools/lib/Disk.h | 2 ++
src/bin/bfs_tools/lib/Hashtable.cpp | 2 +-
----------------------------------------------------------------------------
diff --git a/src/bin/bfs_tools/Jamfile b/src/bin/bfs_tools/Jamfile
index b286992..84e3469 100644
--- a/src/bin/bfs_tools/Jamfile
+++ b/src/bin/bfs_tools/Jamfile
@@ -12,7 +12,7 @@ StdBinCommands
bfswhich.cpp
recover.cpp
- : libbfs_tools.a be : $(haiku-utils_rsrc
+ : libbfs_tools.a be $(TARGET_LIBSTDC++) : $(haiku-utils_rsrc)
;
SubInclude HAIKU_TOP src bin bfs_tools lib ;
diff --git a/src/bin/bfs_tools/lib/BPlusTree.h
b/src/bin/bfs_tools/lib/BPlusTree.h
index 917d710..5a53683 100644
--- a/src/bin/bfs_tools/lib/BPlusTree.h
+++ b/src/bin/bfs_tools/lib/BPlusTree.h
@@ -7,6 +7,8 @@
#include <List.h>
+#include <string.h>
+
#include "Cache.h"
#include "bfs.h"
@@ -158,7 +160,7 @@ class BPlusTree {
bool CheckNode(bplustree_node *node);
private:
- friend NodeCache;
+ friend class NodeCache;
bplustree_node *Node(off_t nodeoffset,bool check = true);
private:
diff --git a/src/bin/bfs_tools/lib/Cache.h b/src/bin/bfs_tools/lib/Cache.h
index 98c2b0e..c4295b9 100644
--- a/src/bin/bfs_tools/lib/Cache.h
+++ b/src/bin/bfs_tools/lib/Cache.h
@@ -8,6 +8,8 @@
#include <SupportDefs.h>
+#include <stdio.h>
+
template<class T> class Cache
{
diff --git a/src/bin/bfs_tools/lib/Disk.cpp b/src/bin/bfs_tools/lib/Disk.cpp
index d03d83d..1e2af9d 100644
--- a/src/bin/bfs_tools/lib/Disk.cpp
+++ b/src/bin/bfs_tools/lib/Disk.cpp
@@ -235,7 +235,7 @@ Disk::DumpBootBlockToFile()
status_t
-Disk::ScanForSuperBlock(off_t start = 0, off_t stop = -1)
+Disk::ScanForSuperBlock(off_t start, off_t stop)
{
printf("Disk size %Ld bytes, %.2f GB\n", fSize, 1.0 * fSize /
(1024*1024*1024));
diff --git a/src/bin/bfs_tools/lib/Disk.h b/src/bin/bfs_tools/lib/Disk.h
index 774d44f..d1e8997 100644
--- a/src/bin/bfs_tools/lib/Disk.h
+++ b/src/bin/bfs_tools/lib/Disk.h
@@ -9,6 +9,8 @@
#include <File.h>
#include <Path.h>
+#include <string.h>
+
#include "Bitmap.h"
#include "bfs.h"
#include "Cache.h"
diff --git a/src/bin/bfs_tools/lib/Hashtable.cpp
b/src/bin/bfs_tools/lib/Hashtable.cpp
index 1cdab31..0a0e2ba 100644
--- a/src/bin/bfs_tools/lib/Hashtable.cpp
+++ b/src/bin/bfs_tools/lib/Hashtable.cpp
@@ -192,7 +192,7 @@ void Hashtable::Rewind()
void
-Hashtable::MakeEmpty(int8 keyMode = HASH_EMPTY_NONE,int8 valueMode =
HASH_EMPTY_NONE)
+Hashtable::MakeEmpty(int8 keyMode,int8 valueMode)
{
fModCount++;
Other related posts:
