Mentions légales du service

Skip to content
Snippets Groups Projects
Commit 21f62d72 authored by Jozef Legény's avatar Jozef Legény
Browse files

[Kernel] Make the Fatal logs follow the same convention as errors

Remove unused code from Simulated box to avoid warnings

[CORE-605](https://jira.mensiatech.com/browse/CORE-605)
parent b978b822
No related branches found
No related tags found
1 merge request!102Bugfix jole core 605 fixes for mensia tests
......@@ -21,7 +21,7 @@ using namespace OpenViBE::Plugins;
// ________________________________________________________________________________________________________________
//
#define OV_IncorrectTime 0xffffffffffffffffll
#define OV_IncorrectTime 0xffffffffffffffffULL
static const CNameValuePairList s_oDummyNameValuePairList;
CSimulatedBox::CSimulatedBox(const IKernelContext& rKernelContext, CScheduler& rScheduler)
......@@ -36,29 +36,11 @@ CSimulatedBox::CSimulatedBox(const IKernelContext& rKernelContext, CScheduler& r
,m_ui64LastClockActivationDate(OV_IncorrectTime)
,m_ui64ClockFrequency(0)
,m_ui64ClockActivationStep(0)
,m_oSceneIdentifier(OV_UndefinedIdentifier)
{
}
CSimulatedBox::~CSimulatedBox(void)
{
m_mSimulatedObjects.clear();
}
CIdentifier CSimulatedBox::getUnusedIdentifier(void) const
{
uint64 l_ui64Identifier=(((uint64)rand())<<32)+((uint64)rand());
CIdentifier l_oResult;
std::map<CIdentifier, CString>::const_iterator i;
do
{
l_ui64Identifier++;
l_oResult=CIdentifier(l_ui64Identifier);
i=m_mSimulatedObjects.find(l_oResult);
}
while(i!=m_mSimulatedObjects.end() || l_oResult==OV_UndefinedIdentifier);
//TODO : browse window and scene maps as well to guarantee ID unicity!
return l_oResult;
}
bool CSimulatedBox::setScenarioIdentifier(const CIdentifier& rScenarioIdentifier)
......
......@@ -169,10 +169,6 @@ namespace OpenViBE
return m_rScheduler;
}
private:
CIdentifier getUnusedIdentifier(void) const;
protected:
OpenViBE::boolean m_bReadyToProcess;
......@@ -188,13 +184,6 @@ namespace OpenViBE
OpenViBE::uint64 m_ui64ClockFrequency;
OpenViBE::uint64 m_ui64ClockActivationStep;
private:
OpenViBE::CIdentifier m_oSceneIdentifier;
OpenViBE::CString m_oSceneName;
/// maps object identifiers to object names
std::map<OpenViBE::CIdentifier, OpenViBE::CString> m_mSimulatedObjects;
public:
std::vector < std::deque < OpenViBE::Kernel::CChunk > > m_vInput;
......
......@@ -348,11 +348,15 @@ while (0)
#define OV_FATAL(description, type, logManager) \
do { \
logManager << OpenViBE::Kernel::LogLevel_Fatal \
<< "[Error description] = " \
<< "{Error description} : {" \
<< description \
<< "; [Error code] = " \
<< "}, {Error type} : {" \
<< convertErrorTypeToString(type) \
<< " (code " \
<< static_cast<unsigned int>((type)) \
<< "\n"; \
<< ")}, {Error location} : {" \
<< __FILE__ << "::" << __LINE__\
<< "}\n"; \
std::abort(); \
} \
while (0)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment