diff options
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Common/Src/ChunkFile.h | 2 | ||||
| -rw-r--r-- | Source/Core/DolphinWX/Src/TASInputDlg.h | 10 | ||||
| -rw-r--r-- | Source/Core/VideoCommon/Src/PixelShaderGen.cpp | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/Source/Core/Common/Src/ChunkFile.h b/Source/Core/Common/Src/ChunkFile.h index 01daec62c0..5935b7f53a 100644 --- a/Source/Core/Common/Src/ChunkFile.h +++ b/Source/Core/Common/Src/ChunkFile.h @@ -99,7 +99,7 @@ public: case MODE_MEASURE: case MODE_VERIFY: { - std::map<unsigned int, T>::iterator itr = x.begin(); + typename std::map<unsigned int, T>::iterator itr = x.begin(); while (number > 0) { Do(itr->first); diff --git a/Source/Core/DolphinWX/Src/TASInputDlg.h b/Source/Core/DolphinWX/Src/TASInputDlg.h index 9a8e17fd46..6e901edee5 100644 --- a/Source/Core/DolphinWX/Src/TASInputDlg.h +++ b/Source/Core/DolphinWX/Src/TASInputDlg.h @@ -41,11 +41,11 @@ class TASInputDlg : public wxDialog void OnMouseUpR(wxMouseEvent& event); void ResetValues(); void GetValues(SPADStatus *PadStatus, int controllerID); - void TASInputDlg::SetTurbo(wxMouseEvent& event); - void TASInputDlg::SetTurboFalse(wxMouseEvent& event); - void TASInputDlg::ButtonTurbo(); - void TASInputDlg::GetKeyBoardInput(SPADStatus *PadStatus); - bool TASInputDlg::TextBoxHasFocus(); + void SetTurbo(wxMouseEvent& event); + void SetTurboFalse(wxMouseEvent& event); + void ButtonTurbo(); + void GetKeyBoardInput(SPADStatus *PadStatus); + bool TextBoxHasFocus(); bool HasFocus(); wxBitmap CreateStickBitmap(int x, int y); diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp index 071c2ea479..437ec4514c 100644 --- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp +++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp @@ -631,9 +631,9 @@ const char *GeneratePixelShaderCode(PSGRENDER_MODE PSGRenderMode, API_TYPE ApiTy { // the screen space depth value = far z + (clip z / clip w) * z range if (numTexgen < 7) - WRITE(p, "float zCoord = "I_ZBIAS"[1].x + (clipPos.z / clipPos.w) * "I_ZBIAS"[1].y;\n"); + WRITE(p, "float zCoord = " I_ZBIAS "[1].x + (clipPos.z / clipPos.w) * " I_ZBIAS "[1].y;\n"); else - WRITE(p, "float zCoord = "I_ZBIAS"[1].x + (uv2.w / uv3.w) * "I_ZBIAS"[1].y;\n"); + WRITE(p, "float zCoord = " I_ZBIAS "[1].x + (uv2.w / uv3.w) * " I_ZBIAS "[1].y;\n"); } char* pmainstart = p; if(PSGRenderMode == PSGRENDER_ZCOMPLOCK && !DepthTextureEnable) |