Merge branch 'push-qkxukwrkklmo' into 'develop'

Fix non-standard code in Trace Analyzer

See merge request ems/astdm/modeling.dram/dram.sys.5!141

extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/common/timedependency.h

@@ -16,16 +16,24 @@ class DBPhaseEntryBase;
 #define PASSFUNCTIONDECL                                                                           \
     ([[maybe_unused]] const std::shared_ptr<DBPhaseEntryBase> thisPhase,                           \
      [[maybe_unused]] const std::shared_ptr<DBPhaseEntryBase> otherPhase)
+
 struct PassFunction
 {
-    using Fn = std::function<bool PASSFUNCTIONDECL>;
-    PassFunction(Fn passFunction) : mPassFn{std::move(passFunction)} {}
+    using Fn = std::function<
+        bool(const std::shared_ptr<DBPhaseEntryBase>&,
+             const std::shared_ptr<DBPhaseEntryBase>&)>;
 
-    bool execute PASSFUNCTIONDECL { return mPassFn(thisPhase, otherPhase); }
+    explicit PassFunction(Fn passFunction) : mPassFn{std::move(passFunction)} {}
+
+    bool execute PASSFUNCTIONDECL
+    {
+        return mPassFn(thisPhase, otherPhase);
+    }
 
     Fn mPassFn;
 };
 
+
 class TimeDependency
 {
 public:

extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/poolcontrollermap.cpp

@@ -9,7 +9,8 @@
 
 PoolControllerMap::PoolControllerMap(const std::map<StringMapper, PoolController>& pools)
 {
-    mPools = pools;
+    mPools.clear();
+    mPools.insert(pools.begin(), pools.end());
 }
 
 void PoolControllerMap::clear()