ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix compilation errors with g++4.7

This commit is contained in:
Pierre Bourdon 2012-05-26 08:09:50 +02:00
parent b79d8d9e10
commit 1efabea9b4
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Common/Src/ChunkFile.h
View File

@ -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);

10
Source/Core/DolphinWX/Src/TASInputDlg.h
View File

@ -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);

4
Source/Core/VideoCommon/Src/PixelShaderGen.cpp
View File

@ -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)