Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Alt Compiler fixes

Browse Source
This commit is contained in:
Drake Arconis
2013-01-08 06:17:39 -05:00
parent bc3ad59dd5
commit 9f7e81cec2
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llcommon/llhash.h
View File

@@ -39,7 +39,7 @@
#include <hash_map> #include <hash_map>
#include <algorithm> #include <algorithm>
#elif LL_DARWIN || LL_LINUX #elif LL_DARWIN || LL_LINUX
#if GCC_VERSION >= 40300 || LL_ICC// gcc 4.3 or icc 11 and up #if GCC_VERSION >= 40300 || LL_ICC || LL_CLANG// gcc 4.3 or icc 11 and up
# include <backward/hashtable.h> # include <backward/hashtable.h>
#elif GCC_VERSION >= 30400 // gcc 3.4 and up #elif GCC_VERSION >= 30400 // gcc 3.4 and up
# include <ext/hashtable.h> # include <ext/hashtable.h>

2
indra/llcommon/llprocessor.cpp
View File

@@ -794,7 +794,7 @@ private:
LLPI_SET_INFO_INT(eModel, "model"); LLPI_SET_INFO_INT(eModel, "model");
S32 family; S32 family = 0;
if (!cpuinfo["cpu family"].empty() if (!cpuinfo["cpu family"].empty()
&& LLStringUtil::convertToS32(cpuinfo["cpu family"], family)) && LLStringUtil::convertToS32(cpuinfo["cpu family"], family))
{ {