The compiler need not obey the static keyword, so to avoid linker
problems, whole functions in .h files need to also be static in case they are included in several .cpp files. Also a few other minor LTO fixes. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7082 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
1 parent
04fcd9499a
commit
98e24f5873
15 files changed
+43
-60
No files matched your search
@@ -449,7 +449,7 @@ u64 GetMurmurHash3(const u8* src, int len, u32 samples)
|
||||
makes identical hashes, this is just a c/p of the 64-bit one. */
|
||||
u64 GetHashHiresTexture(const u8 *src, int len, u32 samples)
|
||||
{
|
||||
const u64 m = 0xc6a4a7935bd1e995;
|
||||
const u64 m = 0xc6a4a7935bd1e995ULL;
|
||||
u64 h = len * m;
|
||||
const int r = 47;
|
||||
u32 Step = (len / 8);
|
||||
|
||||
@@ -68,7 +68,7 @@ bool TryParse(const std::string &str, bool *output);
|
||||
bool TryParse(const std::string &str, u32 *output);
|
||||
|
||||
template <typename N>
|
||||
bool TryParse(const std::string &str, N *const output)
|
||||
static bool TryParse(const std::string &str, N *const output)
|
||||
{
|
||||
std::istringstream iss(str);
|
||||
|
||||
|
||||
Reference in new issue
Block a user