Ticket #1: patch_franck.patch

DBITEPlayerLib/DbtPlyEngine.cpp

@@ -269 +269 @@
 ////////////////////////////////////////////////////////////////////////////////
 void DbtPlyEngine::setState(DbtPlyEngineState * newState)
 {
-    BOOST_ASSERT(newState);
-    LOG_DEBUG(mCurrentState->toString() << " => " << newState->toString());
+        BOOST_ASSERT(newState);
+        LOG_DEBUG(mCurrentState->toString().toStdString() << " => " << newState->toString().toStdString()); //FL added .toStdString()
     mCurrentState = newState;
 
     Q_EMIT displayStateSig(mCurrentState, mSpeed);

DBITEPlayerLib/DbtPlyFileManager.cpp

@@ -285 +285 @@
     int deltaT = road_time() - tNow;
     deltaTDbtTab_[(deltaTDbtTabLoop_++)%1000] = deltaT;
     if (deltaT > kMaxPendingTimeFromEngineMicrosecs) {
-        LOG_WARN(getName() << ": data not replayed: elapsed time since engine notification too big:" << deltaT << "us");
-        return;
+                LOG_WARN(getName().toStdString() << ": data not replayed: elapsed time since engine notification too big:" << deltaT << "us"); //FL added toStdString()
+                return;
     }
 
     timeToRead_ = tDbt;

PacpusLib/ComponentBase.cpp

@@ -562 +562 @@
 void ComponentBase::parseParameters(XmlComponentConfig const& cfg)
 {
     LOG_INFO("Parsing parameters...");
-    LOG_INFO(mOptionsDescription);
+        std::ostringstream temp_stream;         //FL added
+        temp_stream << mOptionsDescription;     //FL added
+        LOG_INFO(temp_stream.str());            //FL changed from LOG_INFO(mOptionsDescription)
     
     po::variables_map vm;
     try {

PacpusLib/XmlConfigFile.cpp

@@ -189 +189 @@
         int errorColumn = 0;
         if (!m_document.setContent(&m_file, /*namespaceProcessing=*/true, &errorMsg, &errorLine, &errorColumn)) {
             LOG_ERROR("cannot parse XML file " << m_file.fileName());
-            LOG_ERROR(errorMsg << " at " << errorLine << ":" << errorColumn << " (line:col)");
+                        LOG_ERROR(errorMsg.toStdString() << " at " << errorLine << ":" << errorColumn << " (line:col)"); //FL added .toStdString()
             m_file.close();
             return 0;
         }