Changeset 365 in pacpusframework

Timestamp:

12/15/15 11:43:22 (8 years ago)

Author:

DHERBOMEZ Gérald

Message:

applying patch relative to ticket ​https://devel.hds.utc.fr/software/pacpus/ticket/1
Pass compilation under Windows 7, Qt5.5, boost 1.59
Pass compilation under Linux, Qt5.2, boost 1.54

Location:

branches/0.2.x/src

Files:

• DBITEPlayerLib/DbtPlyEngine.cpp (modified) (1 diff)
• DBITEPlayerLib/DbtPlyFileManager.cpp (modified) (1 diff)
• PacpusLib/ComponentBase.cpp (modified) (1 diff)
• PacpusLib/XmlConfigFile.cpp (modified) (1 diff)

branches/0.2.x/src/DBITEPlayerLib/DbtPlyEngine.cpp

@@ -270 +270 @@
 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()); 
     mCurrentState = newState;
 

branches/0.2.x/src/DBITEPlayerLib/DbtPlyFileManager.cpp

@@ -286 +286 @@
     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");
+                return;
     }
 

branches/0.2.x/src/PacpusLib/ComponentBase.cpp

@@ -563 +563 @@
 {
     LOG_INFO("Parsing parameters...");
-    LOG_INFO(mOptionsDescription);
+        std::ostringstream temp_stream;         
+        temp_stream << mOptionsDescription;     
+        LOG_INFO(temp_stream.str());            
     
     po::variables_map vm;

branches/0.2.x/src/PacpusLib/XmlConfigFile.cpp

@@ -190 +190 @@
         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)"); 
             m_file.close();
             return 0;