Browse Source

suppress some warnings here and there

Michele Caini 6 years ago
parent
commit
026c5987dd

+ 1 - 1
src/entt/signal/dispatcher.hpp

@@ -67,7 +67,7 @@ class dispatcher {
 
         template<typename... Args>
         void trigger(Args &&... args) {
-            signal.publish({ std::forward<Args>(args)... });
+            signal.publish(Event{std::forward<Args>(args)...});
         }
 
         template<typename... Args>

+ 1 - 1
src/entt/signal/emitter.hpp

@@ -196,7 +196,7 @@ public:
      */
     template<typename Event, typename... Args>
     void publish(Args &&... args) {
-        assure<Event>().publish({ std::forward<Args>(args)... }, *static_cast<Derived *>(this));
+        assure<Event>().publish(Event{std::forward<Args>(args)...}, *static_cast<Derived *>(this));
     }
 
     /**

+ 3 - 1
test/lib/dispatcher/types.h

@@ -7,6 +7,8 @@ struct ENTT_API message {
     int payload;
 };
 
-struct ENTT_API event: message {};
+struct ENTT_API event {
+    int payload;
+};
 
 #endif // ENTT_LIB_DISPATCHER_TYPES_H

+ 3 - 1
test/lib/emitter/types.h

@@ -12,6 +12,8 @@ struct ENTT_API message {
     int payload;
 };
 
-struct ENTT_API event: message {};
+struct ENTT_API event {
+    int payload;
+};
 
 #endif // ENTT_LIB_EMITTER_TYPES_H