added FunctionInfo

Author: dorin-ga

source/gameanalytics/GAUtilities.cpp

@@ -73,10 +73,9 @@ namespace gameanalytics
             return defValue;
         }
 
-        std::pair<std::string, int32_t> getRelevantFunctionFromCallStack()
+        FunctionInfo getRelevantFunctionFromCallStack()
         {
-            std::string function;
-            int32_t line = -1;
+            FunctionInfo funcInfo;
 
             try
             {
@@ -89,19 +88,19 @@ namespace gameanalytics
                        f.find("call_stack") == std::string::npos && 
                        f.find("getRelevantFunctionFromCallStack") == std::string::npos)
                     {
-                        function = f;
-                        line = entry.line;
+                        funcInfo.functionName = f;
+                        funcInfo.lineNumber = entry.line;
                         break;
                     }
                 }
             }
             catch(...)
             {
-                function = "";
-                line = -1;
+                funcInfo.functionName = "";
+                funcInfo.lineNumber   = -1;
             }
 
-            return std::make_pair(function, line);
+            return funcInfo;
         }
 
         // Compress a STL string using zlib with given compression level and return the binary data.
@@ -388,6 +387,7 @@ namespace gameanalytics
                     return true;
                 #endif
             }
+
         }
 
         std::vector<uint8_t> GAUtilities::gzipCompress(const char* data)

source/gameanalytics/GAUtilities.h

@@ -118,7 +118,13 @@ namespace gameanalytics
         std::string printArray(const StringVector& v, std::string const& delimiter = ", ");
         int64_t getNumberFromCache(json& node, std::string const& key, int64_t defValue = 0ll);
 
-        std::pair<std::string, int32_t> getRelevantFunctionFromCallStack();
+        struct FunctionInfo
+        {
+            std::string functionName;
+            int32_t     lineNumber = 0;
+        };
+
+        FunctionInfo getRelevantFunctionFromCallStack();
 
         struct GAUtilities
         {

source/gameanalytics/GameAnalytics.cpp

@@ -539,13 +539,7 @@ namespace gameanalytics
 
         const std::string message = utilities::trimString(message_, maxErrMsgSize);
 
-        std::string function;
-        int32_t line = -1;
-
-        std::pair<std::string, int32_t> inFunction = utilities::getRelevantFunctionFromCallStack();
-        
-        function = inFunction.first;
-        line     = inFunction.second;
+        utilities::FunctionInfo finfo = utilities::getRelevantFunctionFromCallStack();
 
         if(fields.size() > maxFieldsSize)
         {
@@ -563,7 +557,7 @@ namespace gameanalytics
             try
             {
                 json fieldsJson = utilities::parseFields(fields);
-                events::GAEvents::addErrorEvent(severity, message, function, line, fieldsJson, mergeFields);
+                events::GAEvents::addErrorEvent(severity, message, finfo.functionName, finfo.lineNumber, fieldsJson, mergeFields);
             }
             catch(std::exception& e)
             {