From 1ece121b14ae82f7dd0b893d0dbef3de7c84d303 Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Mon, 12 Aug 2019 15:47:59 +0900 Subject: e2ee.h: Make constants inline instead of static This changes from internal linkage for every translation unit including e2ee.h to external linkage across translation units but without the need to create a .cpp file just to define and init the constants. --- lib/e2ee.h | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'lib/e2ee.h') diff --git a/lib/e2ee.h b/lib/e2ee.h index 5a9b83c5..f49b9748 100644 --- a/lib/e2ee.h +++ b/lib/e2ee.h @@ -5,27 +5,27 @@ #include namespace Quotient { -static const auto CiphertextKeyL = "ciphertext"_ls; -static const auto SenderKeyKeyL = "sender_key"_ls; -static const auto DeviceIdKeyL = "device_id"_ls; -static const auto SessionIdKeyL = "session_id"_ls; +inline const auto CiphertextKeyL = "ciphertext"_ls; +inline const auto SenderKeyKeyL = "sender_key"_ls; +inline const auto DeviceIdKeyL = "device_id"_ls; +inline const auto SessionIdKeyL = "session_id"_ls; -static const auto AlgorithmKeyL = "algorithm"_ls; -static const auto RotationPeriodMsKeyL = "rotation_period_ms"_ls; -static const auto RotationPeriodMsgsKeyL = "rotation_period_msgs"_ls; +inline const auto AlgorithmKeyL = "algorithm"_ls; +inline const auto RotationPeriodMsKeyL = "rotation_period_ms"_ls; +inline const auto RotationPeriodMsgsKeyL = "rotation_period_msgs"_ls; -static const auto AlgorithmKey = QStringLiteral("algorithm"); -static const auto RotationPeriodMsKey = QStringLiteral("rotation_period_ms"); -static const auto RotationPeriodMsgsKey = +inline const auto AlgorithmKey = QStringLiteral("algorithm"); +inline const auto RotationPeriodMsKey = QStringLiteral("rotation_period_ms"); +inline const auto RotationPeriodMsgsKey = QStringLiteral("rotation_period_msgs"); -static const auto Ed25519Key = QStringLiteral("ed25519"); -static const auto Curve25519Key = QStringLiteral("curve25519"); -static const auto SignedCurve25519Key = QStringLiteral("signed_curve25519"); -static const auto OlmV1Curve25519AesSha2AlgoKey = +inline const auto Ed25519Key = QStringLiteral("ed25519"); +inline const auto Curve25519Key = QStringLiteral("curve25519"); +inline const auto SignedCurve25519Key = QStringLiteral("signed_curve25519"); +inline const auto OlmV1Curve25519AesSha2AlgoKey = QStringLiteral("m.olm.v1.curve25519-aes-sha2"); -static const auto MegolmV1AesSha2AlgoKey = +inline const auto MegolmV1AesSha2AlgoKey = QStringLiteral("m.megolm.v1.aes-sha2"); -static const QStringList SupportedAlgorithms = { OlmV1Curve25519AesSha2AlgoKey, +inline const QStringList SupportedAlgorithms = { OlmV1Curve25519AesSha2AlgoKey, MegolmV1AesSha2AlgoKey }; } // namespace Quotient -- cgit v1.2.3