commit 05ec0be21bcf7f42b5841dead27e895543736ba3
author Davide Pesavento <davidepesa@gmail.com> Tue Mar 14 21:18:06 2023 -0400
committer Davide Pesavento <davidepesa@gmail.com> Tue Mar 14 21:36:01 2023 -0400
tree 0e9d7dfb27924e574d8642eecb0592b0f5bbd936
parent f6b458930f9b10504a0351188cf83425975ddad3

Use `inline` on all namespace-scope constants defined in headers

Change-Id: Ia6e68d3fe572f6c15978c77a646ac599fa47e575

tests/unit/security/transform/public-key.t.cpp

diff --git a/tests/unit/security/transform/public-key.t.cpp b/tests/unit/security/transform/public-key.t.cpp
index e37cda5..655811c 100644
--- a/tests/unit/security/transform/public-key.t.cpp
+++ b/tests/unit/security/transform/public-key.t.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2022 Regents of the University of California.
+ * Copyright (c) 2013-2023 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -54,8 +54,6 @@
       "9rH58ynaAix0tcR/nBMRLUX+e3rURHg6UbSjJbdb9qmKM1fTGHKUzL/5pMG6uBU0\n"
       "ywIDAQAB\n";
 };
-constexpr KeyType RsaKeyTestData::type;
-constexpr size_t RsaKeyTestData::size;
 
 struct EcKeyTestData
 {
@@ -70,8 +68,6 @@
       "//////////+85vqtpxeehPO5ysL8YyVRAgEBA0IABGhuFibgwLdEJBDOLdvSg1Hc\n"
       "5EJTDxq6ls5FoYLfThp8HOjuwGSz0qw8ocMqyku1y0V5peQ4rEPd0bwcpZd9svA=\n";
 };
-constexpr KeyType EcKeyTestData::type;
-constexpr size_t EcKeyTestData::size;
 
 using KeyTestDataSets = boost::mpl::vector<RsaKeyTestData, EcKeyTestData>;
 

tests/unit/security/validator-fixture.cpp

diff --git a/tests/unit/security/validator-fixture.cpp b/tests/unit/security/validator-fixture.cpp
index 8579fc8..0e780b4 100644
--- a/tests/unit/security/validator-fixture.cpp
+++ b/tests/unit/security/validator-fixture.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2022 Regents of the University of California.
+ * Copyright (c) 2013-2023 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -28,9 +28,6 @@
 inline namespace v2 {
 namespace tests {
 
-const time::milliseconds ValidatorFixtureBase::s_mockPeriod{250};
-const int ValidatorFixtureBase::s_mockTimes = 200;
-
 ValidatorFixtureBase::ValidatorFixtureBase()
 {
   processInterest = [this] (const Interest& interest) {

tests/unit/security/validator-fixture.hpp

diff --git a/tests/unit/security/validator-fixture.hpp b/tests/unit/security/validator-fixture.hpp
index 7e1e0b5..39e4ed3 100644
--- a/tests/unit/security/validator-fixture.hpp
+++ b/tests/unit/security/validator-fixture.hpp
@@ -69,8 +69,8 @@
   ValidationError lastError{ValidationError::NO_ERROR};
 
 private:
-  static const time::milliseconds s_mockPeriod;
-  static const int s_mockTimes;
+  static constexpr time::milliseconds s_mockPeriod{250};
+  static constexpr int s_mockTimes{200};
 };
 
 template<class ValidationPolicyT, class CertificateFetcherT = CertificateFetcherFromNetwork>