Zengtudor/ccls
1
0
Fork 0
mirror of https://github.com/MaskRay/ccls.git synced 2025-06-07 16:54:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix for ccls:Vec not building with MVS

Browse Source
This commit is contained in:
Martin Baliet 2019-03-18 22:59:25 +01:00
parent fd48f6928e
commit 8fd48f4549
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/utils.hh
View File

@ -35,7 +35,7 @@ struct Matcher {
std::string pattern; std::string pattern;
Matcher(const std::string &pattern); // throw Matcher(const std::string &pattern); // throw
Matcher(Matcher&&) = default; Matcher(Matcher &&) = default;
~Matcher(); ~Matcher();
bool Matches(const std::string &text) const; bool Matches(const std::string &text) const;
}; };
@ -95,7 +95,7 @@ inline void hash_combine(std::size_t &seed, const T &v, Rest... rest) {
template <> struct hash<type> { \ template <> struct hash<type> { \
std::size_t operator()(const type &t) const { \ std::size_t operator()(const type &t) const { \
std::size_t ret = 0; \ std::size_t ret = 0; \
ccls::hash_combine(ret, __VA_ARGS__); \ ccls::hash_combine(ret, __VA_ARGS__); \
return ret; \ return ret; \
} \ } \
}; \ }; \
@ -143,7 +143,7 @@ public:
template <typename T> struct Vec { template <typename T> struct Vec {
std::unique_ptr<T[]> a; std::unique_ptr<T[]> a;
int s; int s = 0;
const T *begin() const { return a.get(); } const T *begin() const { return a.get(); }
T *begin() { return a.get(); } T *begin() { return a.get(); }
const T *end() const { return a.get() + s; } const T *end() const { return a.get() + s; }
@ -151,5 +151,16 @@ template <typename T> struct Vec {
int size() const { return s; } int size() const { return s; }
const T &operator[](size_t i) const { return a.get()[i]; } const T &operator[](size_t i) const { return a.get()[i]; }
T &operator[](size_t i) { return a.get()[i]; } T &operator[](size_t i) { return a.get()[i]; }
Vec &operator=(Vec &&rhs) {
a = std::move(rhs.a);
s = rhs.s;
return *this;
}
Vec(const Vec &lhs) : a(std::make_unique<T[]>(lhs.s)), s(lhs.s) {
std::copy(lhs.begin(), lhs.end(), begin());
s = lhs.s;
}
Vec(std::unique_ptr<T[]> &&a_, int size) : a(std::move(a_)), s(size) {}
Vec(){};
}; };
} // namespace ccls } // namespace ccls