Commit 588b0b27 authored by Martin Marinov's avatar Martin Marinov

Merged changes from the research branch with fixes in QGP sanitization and...

Merged changes from the research branch with fixes in QGP sanitization and motorcycle graph crash detection. See https://jira.autodesk.com/browse/REFORM-122 for more details.

[git-p4: depot-paths = "//ReForm/ReForm/main/Base/": change = 13557]
parent 4677bec3
......@@ -34,6 +34,7 @@
#include <string>
#include <vector>
#include <array>
namespace Debug {
......@@ -158,6 +159,17 @@ Stream& operator<<(Stream& _ds, const std::vector<ElementT>& _vec)
return _ds;
}
// Stream operator for std::array<>
template< typename ElementT, size_t _el_nmbr>
Stream& operator<<(Stream& _ds, const std::array<ElementT, _el_nmbr>& _vec)
{
_ds << "[ ";
for (const auto el : _vec)
_ds << el << " ";
_ds << "]";
return _ds;
}
// Stream operator for fixed size arrays
template <typename ElementT, size_t _el_nmbr>
Stream& operator<<(Stream& _ds, const ElementT(&_arr)[_el_nmbr])
......@@ -209,7 +221,7 @@ Stream& operator<<(Stream& _ds, const std::pair<T0, T1>& _pair)
// numeric processing or custom Stream streamers then use this macro thus
// DEB_out(1, "my_class is " << DEB_os_str(my_c) )
#define DEB_os_str(AA) \
dynamic_cast<std::ostringstream &>((std::ostringstream() << AA )).str()
dynamic_cast<std::ostringstream &&>((std::ostringstream() << AA )).str()
}//namespace Debug
......
......@@ -410,16 +410,16 @@ public:
{
// translate the esoteric characters used in IGM DEB_out
if (_c == '') // -62
if (_c == -62 ) // -62
return;
if (_c == '') // 167 = -89
if (_c == -89) // 167 = -89
{
current_.append("&sect;");
return;
}
if (_c == '') // -80
if (_c == -80) // -80
{
current_.append("&deg;");
return;
......
......@@ -8,7 +8,7 @@
// non-disclosure agreement, expressly prescribing the scope
// and manner of such use.
#include "Base/Security/Mandatory.hh"
#include <Base/Security/Mandatory.hh>
#include "StopWatch.hh"
#ifdef WIN32
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment