Commit 288784fe authored by Martin Marinov's avatar Martin Marinov
Browse files

Merge remote-tracking branch 'ReForm/master' into merge-from-ReForm

parents b5be2015 45268903
......@@ -5,6 +5,7 @@
#include "Base/Debug/DebOut.hh"
#include <cstdlib>
#include <cstring>
#include <locale.h>
#include <locale>
#include <time.h>
......@@ -63,13 +64,13 @@ std::string time()
if (err == 0)
return std::string(buffer);
}
return std::string("time() failed");
#else//WIN32
//TODO: Implement a secure version of this code for Linux, OSX
//timeinfo = *localtime(&rawtime);
//char* buffer = asctime(&timeinfo);
str.append("TODO: add_time()");
return std::string("TODO: time() implemented only on Windows");
#endif//WIN32
return std::string();
}
}//namespace Environment
......
......@@ -54,10 +54,13 @@ public:
template <typename ElementT>
inline IOutputStream& print(const size_t _nmbr, const ElementT* _elems)
{
*this << "[ ";
print("[ ");
for (size_t i = 0; i < _nmbr; ++i)
*this << _elems[i] << " ";
*this << "]";
{
*this << _elems[i];
print(' ');
}
print(']');
return *this;
}
};
......
Supports Markdown
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