diff options
| author | ancarola <raffaele.ancarola@epfl.ch> | 2019-01-25 23:47:41 +0100 |
|---|---|---|
| committer | ancarola <raffaele.ancarola@epfl.ch> | 2019-01-25 23:47:41 +0100 |
| commit | 351f83b6d331eef1fb5e1cbfa8bed25da8f96a57 (patch) | |
| tree | 2a7ac7dc499f5b764caba981002e7a17bc1687d0 /engine/include/window.hpp | |
| parent | Core channel in flatland and signal test (diff) | |
| download | flatland-351f83b6d331eef1fb5e1cbfa8bed25da8f96a57.tar.gz flatland-351f83b6d331eef1fb5e1cbfa8bed25da8f96a57.zip | |
Template error on compile signal test
Diffstat (limited to 'engine/include/window.hpp')
| -rw-r--r-- | engine/include/window.hpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/include/window.hpp b/engine/include/window.hpp index 98e8e04..48e8cb0 100644 --- a/engine/include/window.hpp +++ b/engine/include/window.hpp @@ -1,7 +1,7 @@ #ifndef __FLATWINDOW_H__ #define __FLATWINDOW_H__ -#include "core/object.hpp" +#include "object.hpp" #include "serial/keyfocusable.hpp" #include <string> @@ -37,7 +37,7 @@ struct window_status class FlatLayer; -class FlatWindow : virtual public core::object, public KeyFocusable +class FlatWindow : virtual public object, public KeyFocusable { std::string title; window_status status; |