Code/Editor

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

Code/Editor/WipFeatureManager.h

@@ -10,6 +10,9 @@
 #define CRYINCLUDE_EDITOR_WIPFEATUREMANAGER_H
 #pragma once
 
+#include <AzCore/std/string/string.h>
+#include <azCore/std/containers/map.h>
+
 /*
     This class is used to control work in progress features at runtime, so QA can test even if the end user will not see those features
     You can use the console command: e_wipfeature <numeric featureId> enable|disable|hide|show|safemode|fullmode
@@ -72,14 +75,14 @@ public:
         {}
 
         int         m_id;
-        string  m_displayName, m_params;
+        AZStd::string  m_displayName, m_params;
         bool        m_bVisible, m_bEnabled, m_bSafeMode,
         // if true, this feature will be saved into the xml file when Save(...) will be called
                     m_bSaveToXml, m_bLoadedFromXml;
         TWipFeatureUpdateCallback   m_pfnUpdateFeature;
     };
 
-    typedef std::map<int, SWipFeatureInfo> TWipFeatures;
+    typedef AZStd::map<int, SWipFeatureInfo> TWipFeatures;
 
 private:
 
@@ -95,7 +98,7 @@ public:
         if (!s_pInstance)
         {
             s_pInstance = new CWipFeatureManager();
-            assert(s_pInstance);
+            AZ_Assert(s_pInstance, "Could not construct CWipFeatureManager");
         }
 
         return s_pInstance;