diff options
| author | Ben Longbons <b.r.longbons@gmail.com> | 2014-10-13 13:16:34 -0700 |
|---|---|---|
| committer | Ben Longbons <b.r.longbons@gmail.com> | 2014-10-13 14:03:46 -0700 |
| commit | 780a0d771edbe21dcfa3405163ffbdf7f7fa4604 (patch) | |
| tree | ac202254d015d2a2a28ab5bca60c3f5474d168ba /src/map/script-call.hpp | |
| parent | a5e0fe8204a8b3299507a645f3479e9ead6c6110 (diff) | |
| download | tmwa-780a0d771edbe21dcfa3405163ffbdf7f7fa4604.tar.gz tmwa-780a0d771edbe21dcfa3405163ffbdf7f7fa4604.tar.bz2 tmwa-780a0d771edbe21dcfa3405163ffbdf7f7fa4604.tar.xz tmwa-780a0d771edbe21dcfa3405163ffbdf7f7fa4604.zip | |
Convert container lookups to use Option<Borrowed<T>>
Diffstat (limited to 'src/map/script-call.hpp')
| -rw-r--r-- | src/map/script-call.hpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/map/script-call.hpp b/src/map/script-call.hpp index da9d03f..89cadb8 100644 --- a/src/map/script-call.hpp +++ b/src/map/script-call.hpp @@ -24,6 +24,8 @@ #include "fwd.hpp" +#include "../compat/borrow.hpp" + #include "../range/fwd.hpp" #include "../generic/fwd.hpp" @@ -38,16 +40,15 @@ enum class ByteCode : uint8_t; // implemented in script-parse.cpp because reasons struct ScriptPointer { - const ScriptBuffer *code; + Option<Borrowed<const ScriptBuffer>> code; size_t pos; ScriptPointer() - : code() + : code(None) , pos() {} - - ScriptPointer(const ScriptBuffer *c, size_t p) - : code(c) + ScriptPointer(Borrowed<const ScriptBuffer> c, size_t p) + : code(Some(c)) , pos(p) {} |