Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

remove another inline keyword, add -Wno-error=inline

(gcc's -Winline is silly at times, see gcc bug 32089)
  • Loading branch information...
commit f48c3ace4cebac2b09d24c641c0f732167147eb8 1 parent e70aa94
@fuzzie fuzzie authored
Showing with 2 additions and 2 deletions.
  1. +1 −1  CMakeLists.txt
  2. +1 −1  gemrb/core/GameScript/GSUtils.cpp
View
2  CMakeLists.txt
@@ -133,7 +133,7 @@ endif()
IF(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
if ((NOT DISABLE_WERROR) AND GIT_VERSION)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wno-error=cast-align -Wmissing-declarations -Winline")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wno-error=inline -Wno-error=cast-align -Wmissing-declarations -Winline")
endif ()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -W -Wpointer-arith -Wcast-align")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wno-format-y2k -Wno-long-long -fno-strict-aliasing")
View
2  gemrb/core/GameScript/GSUtils.cpp
@@ -2570,7 +2570,7 @@ Gem_Polygon *GetPolygon2DA(ieDword index)
return polygons[index];
}
-inline static bool InterruptSpellcasting(Scriptable* Sender) {
+static bool InterruptSpellcasting(Scriptable* Sender) {
if (Sender->Type != ST_ACTOR) return false;
Actor *caster = (Actor *) Sender;
Please sign in to comment.
Something went wrong with that request. Please try again.