From 3d8bd4132368d02a0d6966136d1f05a556f47209 Mon Sep 17 00:00:00 2001 From: Katie Mummah Date: Sat, 11 Nov 2023 09:23:35 -0700 Subject: [PATCH] remove extra friend classes --- src/agent.h | 2 -- src/composition.h | 2 -- src/context.h | 2 -- src/dynamic_module.h | 5 +---- src/product.h | 2 -- src/resource.h | 2 -- src/timer.h | 2 -- 7 files changed, 1 insertion(+), 16 deletions(-) diff --git a/src/agent.h b/src/agent.h index a4a946165a..e6f10d721b 100644 --- a/src/agent.h +++ b/src/agent.h @@ -21,7 +21,6 @@ #endif class SimInitTest; -class RandomTest; namespace cyclus { @@ -50,7 +49,6 @@ typedef std::map > Inventories; class Agent : public StateWrangler, virtual public Ider { friend class SimInit; friend class ::SimInitTest; - friend class ::RandomTest; public: /// Creates a new agent that is managed by the given context. Note that the diff --git a/src/composition.h b/src/composition.h index 7c44456080..cf6aca5dfe 100644 --- a/src/composition.h +++ b/src/composition.h @@ -6,7 +6,6 @@ #include class SimInitTest; -class RandomTest; namespace cyclus { @@ -39,7 +38,6 @@ typedef std::map CompMap; class Composition { friend class SimInit; friend class ::SimInitTest; - friend class ::RandomTest; public: typedef boost::shared_ptr Ptr; diff --git a/src/context.h b/src/context.h index 088e3c608e..bf6b9e92e7 100644 --- a/src/context.h +++ b/src/context.h @@ -26,7 +26,6 @@ const uint64_t kDefaultSeed = 20160212; const uint64_t kDefaultStride = 10000; class SimInitTest; -class RandomTest; namespace cyclus { @@ -145,7 +144,6 @@ class SimInfo { class Context { public: friend class ::SimInitTest; - friend class ::RandomTest; friend class SimInit; friend class Agent; friend class Timer; diff --git a/src/dynamic_module.h b/src/dynamic_module.h index d94c7f07b7..887f173ad7 100644 --- a/src/dynamic_module.h +++ b/src/dynamic_module.h @@ -8,7 +8,6 @@ // for testing class SimInitTest; -class RandomTest; namespace cyclus { @@ -95,10 +94,8 @@ class DynamicModule { /// added to this map when loaded. static std::map modules_; - /// for testing - see sim_init_tests and random_tests + /// for testing - see sim_init_tests friend class ::SimInitTest; - friend class ::RandomTest; - /// for testing - see sim_init_tests and random_tests static std::map man_ctors_; /// the name of the module diff --git a/src/product.h b/src/product.h index d3ddabb562..6f0e9ee8c7 100644 --- a/src/product.h +++ b/src/product.h @@ -8,7 +8,6 @@ #include "res_tracker.h" class SimInitTest; -class RandomTest; namespace cyclus { @@ -19,7 +18,6 @@ namespace cyclus { class Product : public Resource { friend class SimInit; friend class ::SimInitTest; - friend class ::RandomTest; public: typedef diff --git a/src/resource.h b/src/resource.h index 02f0759f01..b13b52431e 100644 --- a/src/resource.h +++ b/src/resource.h @@ -6,7 +6,6 @@ #include class SimInitTest; -class RandomTest; namespace cyclus { @@ -20,7 +19,6 @@ typedef std::string ResourceType; class Resource { friend class SimInit; friend class ::SimInitTest; - friend class ::RandomTest; public: typedef boost::shared_ptr Ptr; diff --git a/src/timer.h b/src/timer.h index 9076de0468..0072790fcc 100644 --- a/src/timer.h +++ b/src/timer.h @@ -13,7 +13,6 @@ #include "comp_math.h" class SimInitTest; -class RandomTest; namespace cyclus { @@ -22,7 +21,6 @@ class Agent; /// Controls simulation timestepping and inter-timestep phases. class Timer { friend class ::SimInitTest; - friend class ::RandomTest; public: Timer();