From 4e9c3db545b2ff9dc4469f3440dc6caffd3f1832 Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Fri, 29 Mar 2013 15:02:48 +0100 Subject: [PATCH] OSX build fix. --- Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp index 6ce4e1e04c..79bcc1abbd 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp @@ -24,7 +24,7 @@ #include "Render.h" #include -#include +#include namespace OGL { @@ -386,7 +386,7 @@ void CheckForUidMismatch(const ProgramShaderCache::PCache& cache, CodeT& new_cod char szTemp[MAX_PATH]; sprintf(szTemp, "%s%ssuid_mismatch_%04i.txt", File::GetUserPath(D_DUMP_IDX).c_str(), - std::is_same::value ? "p" : std::is_same::value ? "v" : "o", + (typeid(UidT) == typeid(PixelShaderUid)) ? "p" : (typeid(UidT) == typeid(VertexShaderUid)) ? "v" : "o", ++num_failures); // TODO: Should also dump uids @@ -398,7 +398,7 @@ void CheckForUidMismatch(const ProgramShaderCache::PCache& cache, CodeT& new_cod // TODO: Make this more idiot-proof ERROR_LOG(VIDEO, "%s shader uid mismatch!", - std::is_same::value ? "Pixel" : std::is_same::value ? "Vertex" : "Other"); + (typeid(UidT) == typeid(PixelShaderUid)) ? "Pixel" : (typeid(UidT) == typeid(VertexShaderUid)) ? "Vertex" : "Other"); } } }