From af255d5fe69b47e685124ff3b4f1a1c4f15395d9 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Wed, 3 Jul 2019 21:27:54 +0200
Subject: x86_64 patch


diff --git a/makefile b/makefile
index e82d960..6068656 100644
--- a/makefile
+++ b/makefile
@@ -9,8 +9,8 @@ SUBDIRS = \
 # IMKIT_HEADERS=$(addprefix /boot/home/config/include/, $(wildcard libim/*.h))
 
 .PHONY: default clean install dist common
-
-default .DEFAULT : /boot/home/config/include/libim $(IMKIT_HEADERS)
+# /boot/home/config/include/libim $(IMKIT_HEADERS)
+default .DEFAULT : 
 	-@for f in $(SUBDIRS) ; do \
 		$(MAKE) -C $$f -f makefile $@ || exit -1; \
 	done
diff --git a/src/Finder/Finder.h b/src/Finder/Finder.h
index 459d995..22650be 100644
--- a/src/Finder/Finder.h
+++ b/src/Finder/Finder.h
@@ -11,6 +11,8 @@ enum {
 	FINDER_WORDS = 'FiWo'
 };
 
+using namespace std;
+
 void search( map<string,double> & matches, list<string> & words );
 void background_search( BMessenger, string query );
 
diff --git a/src/Finder/SearchItem.h b/src/Finder/SearchItem.h
index 183845e..80b7ad4 100644
--- a/src/Finder/SearchItem.h
+++ b/src/Finder/SearchItem.h
@@ -7,7 +7,7 @@
 class SearchItem : public BStringItem
 {
 	private:
-		string	m_file;
+		std::string	m_file;
 		float	m_weight;
 		
 	public:
diff --git a/src/Finder/makefile b/src/Finder/makefile
index a7229d0..78d7fc0 100644
--- a/src/Finder/makefile
+++ b/src/Finder/makefile
@@ -53,7 +53,7 @@ RSRCS=
 #		naming scheme you need to specify the path to the library
 #		and it's name
 #		library: my_lib.a entry: my_lib.a or path/my_lib.a
-LIBS= be stdc++.r4 sqlite3 layout
+LIBS= be $(STDCPPLIBS) sqlite3 layout
 
 #	specify additional paths to directories following the standard
 #	libXXX.so or libXXX.a naming scheme.  You can specify full paths
diff --git a/src/Indexer/makefile b/src/Indexer/makefile
index 67c6ad7..5ec7b82 100644
--- a/src/Indexer/makefile
+++ b/src/Indexer/makefile
@@ -54,7 +54,7 @@ RSRCS=
 #		naming scheme you need to specify the path to the library
 #		and it's name
 #		library: my_lib.a entry: my_lib.a or path/my_lib.a
-LIBS= be stdc++.r4 sqlite3
+LIBS= be $(STDCPPLIBS)  sqlite3
 
 #	specify additional paths to directories following the standard
 #	libXXX.so or libXXX.a naming scheme.  You can specify full paths
diff --git a/src/common/SQLConnection.cpp b/src/common/SQLConnection.cpp
index d9e3bac..2889ca4 100644
--- a/src/common/SQLConnection.cpp
+++ b/src/common/SQLConnection.cpp
@@ -1,7 +1,10 @@
 #include "SQLConnection.h"
 
+#include <iostream>
 #include <stdio.h>
 
+
+
 //#define DEBUG
 
 #ifdef USE_SQLITE
diff --git a/src/common/SQLConnection.h b/src/common/SQLConnection.h
index 351cc12..3813078 100644
--- a/src/common/SQLConnection.h
+++ b/src/common/SQLConnection.h
@@ -4,6 +4,8 @@
 #include <string>
 #include <OS.h>
 
+using namespace std;
+
 #define USE_SQLITE
 //#define USE_POSTGRES
 
diff --git a/src/common/utils.cpp b/src/common/utils.cpp
index 70423f6..4e131e3 100644
--- a/src/common/utils.cpp
+++ b/src/common/utils.cpp
@@ -98,7 +98,7 @@ get_word( istream & i )
 	transform(
 		word.begin(), word.end(),
 		word.begin(),
-		tolower
+		::tolower
 	);
 	
 	return stem( strip_specials( remove_duplicates(word) ) );
-- 
2.21.0

