diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/dictionary.cpp | 2 | ||||
| -rw-r--r-- | core/math/math_funcs.h | 2 | ||||
| -rw-r--r-- | core/os/os.h | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/core/dictionary.cpp b/core/dictionary.cpp index 1b431f9ec..48e65c734 100644 --- a/core/dictionary.cpp +++ b/core/dictionary.cpp @@ -61,7 +61,7 @@ Variant &Dictionary::operator[](const Variant &p_key) { const Variant &Dictionary::operator[](const Variant &p_key) const { - return ((const OrderedHashMap<Variant, Variant, _DictionaryVariantHash> *)&_p->variant_map)->operator[](p_key); + return _p->variant_map[p_key]; } const Variant *Dictionary::getptr(const Variant &p_key) const { diff --git a/core/math/math_funcs.h b/core/math/math_funcs.h index 7715e5d6e..d5135fe41 100644 --- a/core/math/math_funcs.h +++ b/core/math/math_funcs.h @@ -271,7 +271,7 @@ public: #elif defined(_MSC_VER) && _MSC_VER < 1800 __asm fld a __asm fistp b - /*#elif defined( __GNUC__ ) && ( defined( __i386__ ) || defined( __x86_64__ ) ) +/*#elif defined( __GNUC__ ) && ( defined( __i386__ ) || defined( __x86_64__ ) ) // use AT&T inline assembly style, document that // we use memory as output (=m) and input (m) __asm__ __volatile__ ( diff --git a/core/os/os.h b/core/os/os.h index f5e479ac0..faecdb0e0 100644 --- a/core/os/os.h +++ b/core/os/os.h @@ -109,8 +109,6 @@ protected: virtual int get_video_driver_count() const = 0; virtual const char *get_video_driver_name(int p_driver) const = 0; - virtual VideoMode get_default_video_mode() const = 0; - virtual int get_audio_driver_count() const = 0; virtual const char *get_audio_driver_name(int p_driver) const = 0; |