Merge remote-tracking branch 'origin/master' into topic/jsiwek/supervisor

This commit is contained in:
Jon Siwek 2019-11-05 10:11:47 -08:00
commit cc37e505e4
130 changed files with 1959 additions and 557 deletions

View file

@ -570,15 +570,6 @@ void bro_strerror_r(int bro_errno, char* buf, size_t buflen);
*/
char* zeekenv(const char* name);
/**
* Small convenience function. Does what std::make_unique does in C++14. Will not
* work on arrays.
*/
template <typename T, typename ... Args>
std::unique_ptr<T> build_unique (Args&&... args) {
return std::unique_ptr<T>(new T(std::forward<Args>(args)...));
}
/**
* Escapes bytes in a string that are not valid UTF8 characters with \xYY format. Used
* by the JSON writer and BIF methods.