Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-06 16:48:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Replace build_unique with make_unique

Browse source 
This was a rarely used convenience function from when we did not yet
have c++17 support.
This commit is contained in:
Johanna Amann 2019-10-29 11:50:20 +01:00
parent ff612876c5
commit e2a8dd4db1
3 changed files with 3 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/OpaqueVal.cc
View file

@ -1073,7 +1073,7 @@ bool ParaglobVal::DoUnserialize(const broker::data& data)
try try
{ {
this->internal_paraglob = build_unique<paraglob::Paraglob>(std::move(iv)); this->internal_paraglob = make_unique<paraglob::Paraglob>(std::move(iv));
} }
catch (const paraglob::underflow_error& e) catch (const paraglob::underflow_error& e)
{ {
@ -1093,7 +1093,7 @@ Val* ParaglobVal::DoClone(CloneState* state)
{ {
try { try {
return new ParaglobVal return new ParaglobVal
(build_unique<paraglob::Paraglob>(this->internal_paraglob->serialize())); (make_unique<paraglob::Paraglob>(this->internal_paraglob->serialize()));
} }
catch (const paraglob::underflow_error& e) catch (const paraglob::underflow_error& e)
{ {

2
src/Var.cc
View file

@ -510,7 +510,7 @@ void end_func(Stmt* body)
std::unique_ptr<function_ingredients> gather_function_ingredients(Scope* scope, Stmt* body) std::unique_ptr<function_ingredients> gather_function_ingredients(Scope* scope, Stmt* body)
{ {
auto ingredients = build_unique<function_ingredients>(); auto ingredients = make_unique<function_ingredients>();
ingredients->frame_size = scope->Length(); ingredients->frame_size = scope->Length();
ingredients->inits = scope->GetInits(); ingredients->inits = scope->GetInits();

9
src/util.h
View file

@ -563,15 +563,6 @@ void bro_strerror_r(int bro_errno, char* buf, size_t buflen);
*/ */
char* zeekenv(const char* name); 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 * Escapes bytes in a string that are not valid UTF8 characters with \xYY format. Used
* by the JSON writer and BIF methods. * by the JSON writer and BIF methods.