Commit c9960369 authored by Manuel Moos's avatar Manuel Moos
Browse files

Merge from

parents 4f279f1e c286568a
Pipeline #412103115 passed with stages
in 39 minutes and 3 seconds
......@@ -88,6 +88,7 @@ public:
// defines the used functions, we thus need to include it before
// we define macros for them
#include <string.h>
#include <iostream>
// macros replacing C memory management
#define malloc(SIZE) static_cast<void *>(tNEW(char)[SIZE])
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