Merge pull request #425 from gosu/high-sierra-fix

Fix #424 by silencing reserved UDL warning
gosu · Jan 14, 2018 · 2bf187f · 2bf187f
2 parents 430ad4d + 2c32486
commit 2bf187f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/ext/gosu/extconf.rb b/ext/gosu/extconf.rb
@@ -24,6 +24,7 @@
 
 $CXXFLAGS ||= ""
 $CXXFLAGS << " -std=gnu++11"
+$CXXFLAGS << " -Wno-reserved-user-defined-literal" # see https://github.com/gosu/gosu/issues/424
 
 # For #include <Gosu/...>
 $INCFLAGS << " -I../.."

diff --git a/lib/gosu/compat.rb b/lib/gosu/compat.rb
@@ -163,6 +163,10 @@ module Gosu
   deprecate_const :GOSU_COPYRIGHT_NOTICE, :LICENSES
 
   module Button; end
+
+  # Channel was called SampleInstance before Gosu 0.13.0.
+  SampleInstance = Channel
+  deprecate_const :SampleInstance, :Channel
 
   # Support for KbLeft instead of KB_LEFT and Gp3Button2 instead of GP_3_BUTTON_2.
   Gosu.constants.grep(/^KB_|MS_|GP_/).each do |new_name|

diff --git a/lib/gosu/patches.rb b/lib/gosu/patches.rb
@@ -45,11 +45,6 @@ def eql?(other)
   end
 end
 
-module Gosu
-  # Backwards compatibility: Channel was called SampleInstance before Gosu 0.13.0.
-  SampleInstance = Channel
-end
-
 class Gosu::Window
   # Call Thread.pass every tick, which may or may not be necessary for friendly co-existence with
   # Ruby's Thread class.