Merge branch 'clh' into liuyang

mrDarker

6 天以前 829fe6c6bc33d53fda9c31fd45a37e1df87befff

 SourceCode/Bond/Servo/CCollectionEvent.cpp

@@ -59,9 +59,9 @@
      }
   }

   unsigned int CCollectionEvent::getPortID()
   unsigned int CCollectionEvent::getFirstReportID()
   {
      if (m_reports.empty()) return -1;
      if (m_reports.empty()) return 0;
      return m_reports.front()->getReportId();
   }

@@ -90,6 +90,12 @@
      return nullptr;
   }

   CReport* CCollectionEvent::getFirstReport()
   {
      if (m_reports.empty()) return nullptr;
      return m_reports.front();
   }

   std::vector<CReport*>& CCollectionEvent::getReports()
   {
      return m_reports;