Merge pull request cyclus#598 from bennibbelink/c++-17

abachma2 · Apr 21, 2024 · 129cce7 · 129cce7
2 parents f3708a7 + 09f46f0
commit 129cce7
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 14 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -20,6 +20,7 @@ cycamore Change Log
 * Define the version number in `CMakeLists.txt` and rely on CMake to propagate the version throughout the code (#589)
 * Update version numbers in documentation and fix references to `master` branch (#591)
 * Update build procedure to link against Cyclus' cython generated libraries if needed (#596)
+* Minor modifications for compatibility with the latest GTest library (#598)
 * Remove FindCyclus.cmake from this repo since it is installed with Cyclus (#597)
 
 v1.5.5

diff --git a/src/deploy_inst_tests.cc b/src/deploy_inst_tests.cc
@@ -223,7 +223,7 @@ static int cyclus_agent_tests_connected = ConnectAgentTests();
 #define CYCLUS_AGENT_TESTS_CONNECTED cyclus_agent_tests_connected
 #endif  // CYCLUS_AGENT_TESTS_CONNECTED
 
-INSTANTIATE_TEST_CASE_P(DeployInst, InstitutionTests,
+INSTANTIATE_TEST_SUITE_P(DeployInst, InstitutionTests,
                         Values(&DeployInstitutionConstructor));
-INSTANTIATE_TEST_CASE_P(DeployInst, AgentTests,
+INSTANTIATE_TEST_SUITE_P(DeployInst, AgentTests,
                         Values(&DeployInstitutionConstructor));
diff --git a/src/enrichment_tests.cc b/src/enrichment_tests.cc
@@ -798,7 +798,7 @@ static int cyclus_agent_tests_connected = ConnectAgentTests();
 #endif  // CYCLUS_AGENT_TESTS_CONNECTED
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-INSTANTIATE_TEST_CASE_P(EnrichmentFac, FacilityTests,
+INSTANTIATE_TEST_SUITE_P(EnrichmentFac, FacilityTests,
                         Values(&EnrichmentConstructor));
-INSTANTIATE_TEST_CASE_P(EnrichmentFac, AgentTests,
+INSTANTIATE_TEST_SUITE_P(EnrichmentFac, AgentTests,
                         Values(&EnrichmentConstructor));
diff --git a/src/growth_region_tests.cc b/src/growth_region_tests.cc
@@ -49,8 +49,8 @@ static int cyclus_agent_tests_connected = ConnectAgentTests();
 #endif  // CYCLUS_AGENT_TESTS_CONNECTED
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-INSTANTIATE_TEST_CASE_P(GrowthRegion, RegionTests,
+INSTANTIATE_TEST_SUITE_P(GrowthRegion, RegionTests,
                         Values(&GrowthRegionConstructor));
-INSTANTIATE_TEST_CASE_P(GrowthRegion, AgentTests,
+INSTANTIATE_TEST_SUITE_P(GrowthRegion, AgentTests,
                         Values(&GrowthRegionConstructor));
 #endif  // CYCLUS_HAS_COIN
diff --git a/src/manager_inst_tests.cc b/src/manager_inst_tests.cc
@@ -60,7 +60,7 @@ static int cyclus_agent_tests_connected = ConnectAgentTests();
 #endif  // CYCLUS_AGENT_TESTS_CONNECTED
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-INSTANTIATE_TEST_CASE_P(ManagerInst, InstitutionTests,
+INSTANTIATE_TEST_SUITE_P(ManagerInst, InstitutionTests,
                         Values(&ManagerInstitutionConstructor));
-INSTANTIATE_TEST_CASE_P(ManagerInst, AgentTests,
+INSTANTIATE_TEST_SUITE_P(ManagerInst, AgentTests,
                         Values(&ManagerInstitutionConstructor));
diff --git a/src/sink_tests.cc b/src/sink_tests.cc
@@ -590,5 +590,5 @@ static int cyclus_agent_tests_connected = ConnectAgentTests();
 #endif  // CYCLUS_AGENT_TESTS_CONNECTED
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-INSTANTIATE_TEST_CASE_P(SinkFac, FacilityTests, Values(&SinkConstructor));
-INSTANTIATE_TEST_CASE_P(SinkFac, AgentTests, Values(&SinkConstructor));
+INSTANTIATE_TEST_SUITE_P(SinkFac, FacilityTests, Values(&SinkConstructor));
+INSTANTIATE_TEST_SUITE_P(SinkFac, AgentTests, Values(&SinkConstructor));
diff --git a/src/source_tests.cc b/src/source_tests.cc
@@ -182,6 +182,6 @@ static int cyclus_agent_tests_connected = ConnectAgentTests();
 #define CYCLUS_AGENT_TESTS_CONNECTED cyclus_agent_tests_connected
 #endif  // CYCLUS_AGENT_TESTS_CONNECTED
 
-INSTANTIATE_TEST_CASE_P(SourceFac, FacilityTests, Values(&SourceConstructor));
-INSTANTIATE_TEST_CASE_P(SourceFac, AgentTests, Values(&SourceConstructor));
+INSTANTIATE_TEST_SUITE_P(SourceFac, FacilityTests, Values(&SourceConstructor));
+INSTANTIATE_TEST_SUITE_P(SourceFac, AgentTests, Values(&SourceConstructor));
 
diff --git a/src/storage_tests.cc b/src/storage_tests.cc
@@ -885,8 +885,8 @@ static int cyclus_agent_tests_connected = ConnectAgentTests();
 #endif // CYCLUS_AGENT_TESTS_CONNECTED
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-INSTANTIATE_TEST_CASE_P(StorageFac, FacilityTests,
+INSTANTIATE_TEST_SUITE_P(StorageFac, FacilityTests,
                         ::testing::Values(&StorageConstructor));
 
-INSTANTIATE_TEST_CASE_P(StorageFac, AgentTests,
+INSTANTIATE_TEST_SUITE_P(StorageFac, AgentTests,
                         ::testing::Values(&StorageConstructor));