From f9c9cb5bcae1c28afd9c59358ffd0904d9fda2e3 Mon Sep 17 00:00:00 2001 From: Varun Patil Date: Wed, 8 May 2019 17:16:32 +0530 Subject: [PATCH] Remove optnone --- binding-mruby/binding-mruby.cpp | 10 +++++----- binding-mruby/bitmap-binding.cpp | 6 +++--- binding-mruby/disposable-binding.h | 2 +- binding-mruby/etc-binding.cpp | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/binding-mruby/binding-mruby.cpp b/binding-mruby/binding-mruby.cpp index ab004b2..450e127 100644 --- a/binding-mruby/binding-mruby.cpp +++ b/binding-mruby/binding-mruby.cpp @@ -91,7 +91,7 @@ void graphicsBindingInit(mrb_state *); /* From module_rpg.c */ extern const uint8_t rpg_mrb[]; -static void __attribute__ ((optnone)) mrbBindingInit(mrb_state *mrb) +static void mrbBindingInit(mrb_state *mrb) { int arena = mrb_gc_arena_save(mrb); @@ -262,7 +262,7 @@ runMrbFile(mrb_state *mrb, const char *filename) static MrbData * mrbData; static mrb_state * static_scriptmrb; -static void __attribute__ ((optnone)) main_update_loop() { +static void main_update_loop() { mrb_state * mrb = (mrb_state *) static_cast(shState->bindingData()); mrb_load_nstring_cxt(mrb, "main_update_loop", 16, NULL); #ifdef __EMSCRIPTEN__ @@ -406,7 +406,7 @@ runRMXPScripts(mrb_state *mrb, mrbc_context *ctx) #endif } -static void __attribute__ ((optnone)) mrbBindingMain() +static void mrbBindingMain() { mrb_state *mrb = mrb_open(); @@ -457,7 +457,7 @@ void downloadFailed(emscripten_fetch_t *fetch) { emscripten_fetch_close(fetch); } -void __attribute__ ((optnone)) supermainloop() { +void supermainloop() { if (assetQ > 0) return; if (initialized) { @@ -468,7 +468,7 @@ void __attribute__ ((optnone)) supermainloop() { } } -static void __attribute__ ((optnone)) mrbBindingExecute() +static void mrbBindingExecute() { assetQ = 1; emscripten_fetch_attr_t attr; diff --git a/binding-mruby/bitmap-binding.cpp b/binding-mruby/bitmap-binding.cpp index 42c3466..74e7429 100644 --- a/binding-mruby/bitmap-binding.cpp +++ b/binding-mruby/bitmap-binding.cpp @@ -29,7 +29,7 @@ DEF_TYPE(Bitmap); -__attribute__ ((optnone)) MRB_METHOD(bitmapInitialize) +MRB_METHOD(bitmapInitialize) { Bitmap *b = 0; @@ -65,7 +65,7 @@ __attribute__ ((optnone)) MRB_METHOD(bitmapInitialize) return self; } -__attribute__ ((optnone)) MRB_METHOD(bitmapWidth) +MRB_METHOD(bitmapWidth) { Bitmap *b = getPrivateData(mrb, self); @@ -304,7 +304,7 @@ MRB_METHOD(bitmapSetFont) INITCOPY_FUN(Bitmap) -void __attribute__ ((optnone)) +void bitmapBindingInit(mrb_state *mrb) { RClass *klass = defineClass(mrb, "Bitmap"); diff --git a/binding-mruby/disposable-binding.h b/binding-mruby/disposable-binding.h index f12c3d4..a1c2725 100644 --- a/binding-mruby/disposable-binding.h +++ b/binding-mruby/disposable-binding.h @@ -96,7 +96,7 @@ MRB_METHOD(disposableIsDisposed) } template -static __attribute__ ((optnone)) void disposableBindingInit(mrb_state *mrb, RClass *klass) +static void disposableBindingInit(mrb_state *mrb, RClass *klass) { mrb_define_method(mrb, klass, "dispose", disposableDispose, MRB_ARGS_NONE()); mrb_define_method(mrb, klass, "disposed?", disposableIsDisposed, MRB_ARGS_NONE()); diff --git a/binding-mruby/etc-binding.cpp b/binding-mruby/etc-binding.cpp index 7a42bba..ef9ca3b 100644 --- a/binding-mruby/etc-binding.cpp +++ b/binding-mruby/etc-binding.cpp @@ -181,7 +181,7 @@ INITCOPY_FUN(Rect) mrb_define_method(mrb, klass, "inspect", Klass##Stringify, MRB_ARGS_NONE()); \ } -void __attribute__ ((optnone)) etcBindingInit(mrb_state *mrb) +void etcBindingInit(mrb_state *mrb) { RClass *klass;