diff options
author | Raphael Langella <raphael.langella@gmail.com> | 2012-08-26 22:50:06 +0200 |
---|---|---|
committer | Raphael Langella <raphael.langella@gmail.com> | 2012-08-26 23:06:30 +0200 |
commit | 770bcbd1844b97b671d0e47ea8313cdf2c74c5ea (patch) | |
tree | e030cf61afce9ca69b74bb38eb73734bf10f633e /crawl-ref/source/dlua.h | |
parent | a6c16c7f2066c854a01f25e9e6c3d8e44282a638 (diff) | |
download | crawl-ref-770bcbd1844b97b671d0e47ea8313cdf2c74c5ea.tar.gz crawl-ref-770bcbd1844b97b671d0e47ea8313cdf2c74c5ea.zip |
Use std namespace.
I had to rename distance() (in coord.h) to distance2() because it conflicts
with the STL function to compare 2 iterators. Not a bad change given how it
returns the square of the distance anyway.
I also had to rename the message global variable (in message.cc) to buffer.
I tried to fix and improve the coding style has much as I could, but I
probably missed a few given how huge and tedious it is.
I also didn't touch crawl-gdb.py, and the stuff in prebuilt, rltiles/tool
and util/levcomp.*, because I have no clue about those.
Diffstat (limited to 'crawl-ref/source/dlua.h')
-rw-r--r-- | crawl-ref/source/dlua.h | 35 |
1 files changed, 17 insertions, 18 deletions
diff --git a/crawl-ref/source/dlua.h b/crawl-ref/source/dlua.h index 610cdd1951..e184fbfa44 100644 --- a/crawl-ref/source/dlua.h +++ b/crawl-ref/source/dlua.h @@ -24,10 +24,10 @@ class writer; class dlua_chunk { private: - std::string file; - std::string chunk; - std::string compiled; - std::string context; + string file; + string chunk; + string compiled; + string context; int first, last; // First and last lines of the original source. enum chunk_t @@ -39,36 +39,35 @@ private: private: int check_op(CLua &, int); - std::string rewrite_chunk_prefix(const std::string &line, - bool skip_body = false) const; - std::string get_chunk_prefix(const std::string &s) const; + string rewrite_chunk_prefix(const string &line, bool skip_body = false) const; + string get_chunk_prefix(const string &s) const; public: - mutable std::string error; + mutable string error; public: - dlua_chunk(const std::string &_context = "dlua_chunk"); + dlua_chunk(const string &_context = "dlua_chunk"); dlua_chunk(lua_State *ls); - static dlua_chunk precompiled(const std::string &compiled); + static dlua_chunk precompiled(const string &compiled); - std::string describe(const std::string &chunkname) const; + string describe(const string &chunkname) const; void clear(); - void add(int line, const std::string &line2); - void set_chunk(const std::string &s); + void add(int line, const string &line2); + void set_chunk(const string &s); int load(CLua &interp); int run(CLua &interp); int load_call(CLua &interp, const char *function); - void set_file(const std::string &s); + void set_file(const string &s); - const std::string &lua_string() const { return chunk; } - std::string orig_error() const; - bool rewrite_chunk_errors(std::string &err) const; + const string &lua_string() const { return chunk; } + string orig_error() const; + bool rewrite_chunk_errors(string &err) const; bool empty() const; - const std::string &compiled_chunk() const { return compiled; } + const string &compiled_chunk() const { return compiled; } void write(writer&) const; void read(reader&); |