More work on moving engine into dlmalloc heap
This commit is contained in:
@@ -4,12 +4,12 @@
|
||||
#include "wrap-string.hpp"
|
||||
#include "wrap-set.hpp"
|
||||
#include "wrap-map.hpp"
|
||||
#include "wrap-algorithm.hpp"
|
||||
#include "wrap-vector.hpp"
|
||||
#include "wrap-sstream.hpp"
|
||||
#include "wrap-ostream.hpp"
|
||||
#include "wrap-memory.hpp"
|
||||
#include "wrap-utility.hpp"
|
||||
|
||||
#include <ostream>
|
||||
#include <memory>
|
||||
#include <utility>
|
||||
#include <algorithm>
|
||||
#include <string_view>
|
||||
|
||||
#include "luastack.hpp"
|
||||
@@ -32,11 +32,11 @@ enum MessageType {
|
||||
};
|
||||
|
||||
using StringVec = eng::vector<eng::string>;
|
||||
using StringPair = eng::pair<eng::string, eng::string>;
|
||||
using StringPair = std::pair<eng::string, eng::string>;
|
||||
using StringSet = eng::set<eng::string>;
|
||||
using LuaSourceVec = eng::vector<StringPair>;
|
||||
using LuaSourcePtr = eng::unique_ptr<LuaSourceVec>;
|
||||
using HashValue = eng::pair<uint64_t, uint64_t>;
|
||||
using LuaSourcePtr = std::unique_ptr<LuaSourceVec>;
|
||||
using HashValue = std::pair<uint64_t, uint64_t>;
|
||||
using IdVector = eng::vector<int64_t>;
|
||||
|
||||
// Return seconds elapsed, for profiling purposes.
|
||||
@@ -46,7 +46,7 @@ double profiling_clock();
|
||||
bool is_identifier(const eng::string &str);
|
||||
|
||||
// Output a string to a stream using Lua string escaping and quoting.
|
||||
void quote_string(const eng::string &str, eng::ostream *os);
|
||||
void quote_string(const eng::string &str, std::ostream *os);
|
||||
|
||||
// ID vector quick create.
|
||||
IdVector id_vector_create(int64_t id1=-1, int64_t id2=-1, int64_t id3=-1, int64_t id4=-1);
|
||||
@@ -128,8 +128,8 @@ bool is_lua_comment(const eng::string &line);
|
||||
|
||||
// Remove nullptrs from a vector of unique pointers.
|
||||
template<class T>
|
||||
void remove_nullptrs(eng::vector<eng::unique_ptr<T>> &vec) {
|
||||
eng::unique_ptr<T> nullp;
|
||||
void remove_nullptrs(eng::vector<std::unique_ptr<T>> &vec) {
|
||||
std::unique_ptr<T> nullp;
|
||||
auto iter = std::remove(vec.begin(), vec.end(), nullp);
|
||||
vec.erase(iter, vec.end());
|
||||
}
|
||||
@@ -144,7 +144,7 @@ struct XYZ {
|
||||
eng::string debug_string() const;
|
||||
};
|
||||
|
||||
// These are formatting directives that can be sent to a eng::ostream.
|
||||
// These are formatting directives that can be sent to a std::ostream.
|
||||
class hex64 {};
|
||||
class hex32 {};
|
||||
class hex16 {};
|
||||
@@ -158,9 +158,9 @@ public:
|
||||
|
||||
} // namespace util
|
||||
|
||||
eng::ostream &operator<<(eng::ostream &oss, const util::hex64 &v);
|
||||
eng::ostream &operator<<(eng::ostream &oss, const util::hex32 &v);
|
||||
eng::ostream &operator<<(eng::ostream &oss, const util::hex16 &v);
|
||||
eng::ostream &operator<<(eng::ostream &oss, const util::hex8 &v);
|
||||
std::ostream &operator<<(std::ostream &oss, const util::hex64 &v);
|
||||
std::ostream &operator<<(std::ostream &oss, const util::hex32 &v);
|
||||
std::ostream &operator<<(std::ostream &oss, const util::hex16 &v);
|
||||
std::ostream &operator<<(std::ostream &oss, const util::hex8 &v);
|
||||
|
||||
#endif // UTIL_HPP
|
||||
|
||||
Reference in New Issue
Block a user