Add nodiscard attributes and minor refactor

mogemimi · Aug 8, 2019 · c908bf0 · c908bf0
1 parent 0abf705
commit c908bf0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/include/Pomdog/Signals/detail/DelegateBody.hpp b/include/Pomdog/Signals/detail/DelegateBody.hpp
@@ -60,7 +60,7 @@ class POMDOG_EXPORT DelegateConnectionBody final : public ConnectionBody {
         return false;
     }
 
-    std::unique_ptr<ConnectionBody> DeepCopy() const override
+    [[nodiscard]] std::unique_ptr<ConnectionBody> DeepCopy() const override
     {
         auto conn = std::make_unique<DelegateConnectionBody>();
         conn->weakSignal = weakSignal;
@@ -87,6 +87,7 @@ class POMDOG_EXPORT DelegateBody<void(Arguments...)> final
     {
         slot = std::forward<Function>(slotIn);
         ++slotID;
+        POMDOG_ASSERT(slotID > 0);
 
         if (slot == nullptr) {
             return nullptr;

diff --git a/include/Pomdog/Signals/detail/SignalBody.hpp b/include/Pomdog/Signals/detail/SignalBody.hpp
@@ -24,7 +24,7 @@ class POMDOG_EXPORT ConnectionBody {
     virtual ~ConnectionBody() = default;
     virtual void Disconnect() = 0;
     [[nodiscard]] virtual bool Valid() const = 0;
-    virtual std::unique_ptr<ConnectionBody> DeepCopy() const = 0;
+    [[nodiscard]] virtual std::unique_ptr<ConnectionBody> DeepCopy() const = 0;
 };
 
 template <typename Function>
@@ -59,7 +59,7 @@ class ConnectionBodyOverride final : public ConnectionBody {
         slotIndex = std::nullopt;
     }
 
-    bool Valid() const override
+    [[nodiscard]] bool Valid() const override
     {
         if (slotIndex == std::nullopt) {
             return false;
@@ -71,7 +71,7 @@ class ConnectionBodyOverride final : public ConnectionBody {
         return false;
     }
 
-    std::unique_ptr<ConnectionBody> DeepCopy() const override
+    [[nodiscard]] std::unique_ptr<ConnectionBody> DeepCopy() const override
     {
         auto conn = std::make_unique<ConnectionBodyOverride>();
         conn->weakSignal = weakSignal;