mega_venik/sdcv
1
0
Fork 0
mirror of https://github.com/Dushistov/sdcv.git synced 2025-12-16 18:01:54 +00:00
Code Issues Projects Releases Wiki Activity

replace array with variable size with vector,

Browse Source 
this should help clang compiler to compile our source code
This commit is contained in:
Evgeniy Dushistov
2013-07-06 12:52:48 +00:00
parent 2a5da7969f
commit ab22f8eb41
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/lib/file.hpp
View File

@@ -43,7 +43,7 @@ void for_each_file(const List& dirs_list, const std::string& suff,
List::const_iterator it; List::const_iterator it;
for (it=order_list.begin(); it!=order_list.end(); ++it) { for (it=order_list.begin(); it!=order_list.end(); ++it) {
bool disable=std::find(disable_list.begin(), disable_list.end(), bool disable=std::find(disable_list.begin(), disable_list.end(),
*it)!=disable_list.end(); *it)!=disable_list.end();
f(*it, disable); f(*it, disable);
} }
for (it=dirs_list.begin(); it!=dirs_list.end(); ++it) for (it=dirs_list.begin(); it!=dirs_list.end(); ++it)

4
src/lib/lib.cpp
View File

@@ -750,12 +750,12 @@ bool wordlist_index::load(const std::string& url, gulong wc, gulong fsize)
idxdatabuf = (gchar *)g_malloc(fsize); idxdatabuf = (gchar *)g_malloc(fsize);
gulong len = gzread(in, idxdatabuf, fsize); const int len = gzread(in, idxdatabuf, fsize);
gzclose(in); gzclose(in);
if (len < 0) if (len < 0)
return false; return false;
if (len != fsize) if (gulong(len) != fsize)
return false; return false;
wordlist.resize(wc+1); wordlist.resize(wc+1);

2
src/lib/lib.h
View File

@@ -119,7 +119,7 @@ public:
glong narticles(int idict) { return oLib[idict]->narticles(); } glong narticles(int idict) { return oLib[idict]->narticles(); }
const std::string& dict_name(int idict) { return oLib[idict]->dict_name(); } const std::string& dict_name(int idict) { return oLib[idict]->dict_name(); }
gint ndicts() { return oLib.size(); } gint ndicts() const { return oLib.size(); }
const gchar * poGetWord(glong iIndex,int iLib) { const gchar * poGetWord(glong iIndex,int iLib) {
return oLib[iLib]->get_key(iIndex); return oLib[iLib]->get_key(iIndex);

4
src/libwrapper.cpp
View File

@@ -209,8 +209,8 @@ void Library::LookupWithRule(const string &str, TSearchResultList& res_list)
void Library::LookupData(const string &str, TSearchResultList& res_list) void Library::LookupData(const string &str, TSearchResultList& res_list)
{ {
std::vector<gchar *> drl[ndicts()]; std::vector<std::vector<gchar *> > drl(ndicts());
if (!Libs::LookupData(str.c_str(), drl)) if (!Libs::LookupData(str.c_str(), &drl[0]))
return; return;
for (int idict=0; idict<ndicts(); ++idict) for (int idict=0; idict<ndicts(); ++idict)
for (std::vector<gchar *>::size_type j=0; j<drl[idict].size(); ++j) { for (std::vector<gchar *>::size_type j=0; j<drl[idict].size(); ++j) {

2
tests/t_utf8input
View File

@@ -16,7 +16,7 @@ for i in `../src/sdcv --utf8-input -n человек 2>&1`; do
done done
if [ $j -eq 1 ]; then if [ $j -eq 1 ]; then
echo "empty results of search: test failed" >&2 echo "$0: empty results of search: test failed" >&2
exit 1 exit 1
fi fi