Skip to content

Commit

Permalink
Fix build
Browse files Browse the repository at this point in the history
Also wraps the makro in do { ... } while(0) to make the compiler
complain about a missing semicolon after a BS_LOG invokation.
  • Loading branch information
ataulien committed Jul 13, 2019
1 parent c3c769f commit e176800
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions Source/Plugins/bsfGLRenderAPI/Linux/BsLinuxRenderWindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ namespace bs
UINT32 outputIdx = mode.outputIdx;
if(outputIdx >= videoModeInfo.getNumOutputs())
{
BS_LOG(Error, Platform, "Invalid output device index.")
BS_LOG(Error, Platform, "Invalid output device index.");
return;
}

Expand Down Expand Up @@ -385,7 +385,7 @@ namespace bs
UINT32 outputIdx = 0; // 0 is always primary
if(outputIdx >= videoModeInfo.getNumOutputs())
{
BS_LOG(Error, Platform, "Invalid output device index.")
BS_LOG(Error, Platform, "Invalid output device index.");
return;
}

Expand Down
4 changes: 2 additions & 2 deletions Source/Plugins/bsfGLRenderAPI/MacOS/BsMacOSRenderWindow.mm
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@
UINT32 outputIdx = videoMode.outputIdx;
if(outputIdx >= videoModeInfo.getNumOutputs())
{
BS_LOG(Error, Platform, "Invalid output device index.")
BS_LOG(Error, Platform, "Invalid output device index.");
return;
}

Expand Down Expand Up @@ -290,7 +290,7 @@
UINT32 outputIdx = 0; // 0 is always primary
if(outputIdx >= videoModeInfo.getNumOutputs())
{
BS_LOG(Error, Platform, "Invalid output device index.")
BS_LOG(Error, Platform, "Invalid output device index.");
return;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@ namespace bs
UINT32 outputIdx = mode.outputIdx;
if(outputIdx >= videoModeInfo.getNumOutputs())
{
BS_LOG(Error, Platform, "Invalid output device index.")
BS_LOG(Error, Platform, "Invalid output device index.");
return;
}

Expand Down Expand Up @@ -455,7 +455,7 @@ namespace bs
UINT32 outputIdx = 0; // 0 is always primary
if(outputIdx >= videoModeInfo.getNumOutputs())
{
BS_LOG(Error, Platform, "Invalid output device index.")
BS_LOG(Error, Platform, "Invalid output device index.");
return;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@
UINT32 outputIdx = videoMode.outputIdx;
if(outputIdx >= videoModeInfo.getNumOutputs())
{
BS_LOG(Error, Platform, "Invalid output device index.")
BS_LOG(Error, Platform, "Invalid output device index.");
return;
}

Expand Down Expand Up @@ -297,7 +297,7 @@
UINT32 outputIdx = 0; // 0 is always primary
if(outputIdx >= videoModeInfo.getNumOutputs())
{
BS_LOG(Error, Platform, "Invalid output device index.")
BS_LOG(Error, Platform, "Invalid output device index.");
return;
}

Expand Down
2 changes: 1 addition & 1 deletion Source/Scripting/bsfScript/BsScriptExec.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ int main(int __argc, char* __argv[])
// No assembly to run, or Mono directory not provided
if(__argc < 2)
{
BS_LOG(Error, Script, "No assembly provided")
BS_LOG(Error, Script, "No assembly provided");
return 0;
}

Expand Down
4 changes: 2 additions & 2 deletions Source/Scripting/bsfScript/Extensions/BsRenderTargetEx.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ namespace bs
depthStencilSurfaceDesc.numFaces = 1;

if (!depthStencilSurface.isLoaded())
BS_LOG(Error, RenderBackend, "Render texture must be created using a fully loaded texture.")
BS_LOG(Error, RenderBackend, "Render texture must be created using a fully loaded texture.");
else
depthStencilSurfaceDesc.texture = depthStencilSurface;
}
Expand All @@ -89,7 +89,7 @@ namespace bs
surfaceDesc.numFaces = 1;

if (!colorSurfaces[i].isLoaded())
BS_LOG(Error, RenderBackend, "Render texture must be created using a fully loaded texture.")
BS_LOG(Error, RenderBackend, "Render texture must be created using a fully loaded texture.");
else
surfaceDesc.texture = colorSurfaces[i];

Expand Down

0 comments on commit e176800

Please sign in to comment.