matthew/The-Powder-Toy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix one more compiling error

Browse Source 
(was using outdated SearchModel.h so reverted to official version)
This commit is contained in:
jacob1 2012-09-03 20:21:55 -04:00 committed by Simon Robertshaw
parent f8f70a3f77
commit 66af9969d6
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Config.h
View File

@ -181,7 +181,7 @@ extern unsigned char ZSIZE;
#ifdef WIN #ifdef WIN
#define strcasecmp stricmp #define strcasecmp stricmp
#endif //_MSC_VER #endif
#if defined(_MSC_VER) #if defined(_MSC_VER)
#define fmin(a,b) (((a) < (b)) ? (a) : (b)) #define fmin(a,b) (((a) < (b)) ? (a) : (b))
#define fminf(a,b) (((a) < (b)) ? (a) : (b)) #define fminf(a,b) (((a) < (b)) ? (a) : (b))

2
src/Format.cpp
View File

@ -4,7 +4,7 @@
#include <stdexcept> #include <stdexcept>
#include <iostream> #include <iostream>
#include <iterator> #include <iterator>
#include "zlib.h" #include <zlib.h>
#include <stdio.h> #include <stdio.h>
#include "Format.h" #include "Format.h"
#include "graphics/Graphics.h" #include "graphics/Graphics.h"

2
src/search/SearchModel.h
View File

@ -61,7 +61,7 @@ public:
vector<SaveInfo*> GetSaveList(); vector<SaveInfo*> GetSaveList();
vector<pair<string, int> > GetTagList(); vector<pair<string, int> > GetTagList();
string GetLastError() { return lastError; } string GetLastError() { return lastError; }
int GetPageCount() { return max(1, (int)(ceil(resultCount/16))); } int GetPageCount() { return max(1, (int)(ceil(resultCount/16.0f))); }
int GetPageNum() { return currentPage; } int GetPageNum() { return currentPage; }
std::string GetLastQuery() { return lastQuery; } std::string GetLastQuery() { return lastQuery; }
void SetSort(string sort) { if(!updateSaveListWorking) { currentSort = sort; } notifySortChanged(); } void SetSort(string sort) { if(!updateSaveListWorking) { currentSort = sort; } notifySortChanged(); }