From 3596f8a97c30cd881a0ec0636e376763bc696854 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Fri, 16 Oct 2015 12:43:06 -0400
Subject: [PATCH] default_types: fix unused warning
---
include/opendht/default_types.h | 16 ++--------------
src/default_types.cpp | 17 +++++++++++++++++
2 files changed, 19 insertions(+), 14 deletions(-)
diff --git a/include/opendht/default_types.h b/include/opendht/default_types.h
index 99fd70be..74ebf236 100644
--- a/include/opendht/default_types.h
+++ b/include/opendht/default_types.h
@@ -227,20 +227,8 @@ private:
};
-const std::array<std::reference_wrapper<const ValueType>, 5>
-DEFAULT_TYPES
-{
- ValueType::USER_DATA,
- DhtMessage::TYPE,
- ImMessage::TYPE,
- IceCandidates::TYPE,
- TrustRequest::TYPE
-};
+extern const std::array<std::reference_wrapper<const ValueType>, 5> DEFAULT_TYPES;
-const std::array<std::reference_wrapper<const ValueType>, 1>
-DEFAULT_INSECURE_TYPES
-{
- IpServiceAnnouncement::TYPE
-};
+extern const std::array<std::reference_wrapper<const ValueType>, 1> DEFAULT_INSECURE_TYPES;
}
diff --git a/src/default_types.cpp b/src/default_types.cpp
index 05a1d418..a8521d0a 100644
--- a/src/default_types.cpp
+++ b/src/default_types.cpp
@@ -100,4 +100,21 @@ const ValueType ImMessage::TYPE = {3, "IM message", std::chrono::minutes(5)};
const ValueType TrustRequest::TYPE = {4, "Certificate trust request", std::chrono::hours(24*7)};
const ValueType IceCandidates::TYPE = {5, "ICE candidates", std::chrono::minutes(5)};
+
+const std::array<std::reference_wrapper<const ValueType>, 5>
+DEFAULT_TYPES
+{
+ ValueType::USER_DATA,
+ DhtMessage::TYPE,
+ ImMessage::TYPE,
+ IceCandidates::TYPE,
+ TrustRequest::TYPE
+};
+
+const std::array<std::reference_wrapper<const ValueType>, 1>
+DEFAULT_INSECURE_TYPES
+{
+ IpServiceAnnouncement::TYPE
+};
+
}
--
GitLab