Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-08 01:28:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Update paraglob serialization.

Browse source
This commit is contained in:
Zeke Medley 2019-06-20 15:13:31 -07:00
parent a5f6757d7d
commit f1779a2518
2 changed files with 20 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/OpaqueVal.h
View file

@ -3,12 +3,9 @@
#ifndef OPAQUEVAL_H
#define OPAQUEVAL_H
<<<<<<< HEAD
#include <typeinfo>
#include <memory> // std::unique_ptr
=======
>>>>>>> upstream/master
#include "RandTest.h"
#include "Val.h"
#include "digest.h"
@ -333,6 +330,8 @@ public:
protected:
ParaglobVal() : OpaqueVal(paraglob_type) {}
DECLARE_OPAQUE_VALUE(ParaglobVal)
private:
std::unique_ptr<paraglob::Paraglob> internal_paraglob;
// Small convenience function. Does what std::make_unique does in C++14. Wont
@ -341,8 +340,6 @@ private:
std::unique_ptr<T> build_unique (Args&&... args) {
return std::unique_ptr<T>(new T(std::forward<Args>(args)...));
}
DECLARE_SERIAL(ParaglobVal)
};
#endif