mirror of
https://github.com/romkatv/powerlevel10k.git
synced 2026-09-10 07:16:24 -04:00
Squashed 'gitstatus/' changes from 39d34dff..7822a026
7822a026 Fix typo in use of _GITSTATUS_DIRTY_MAX_INDEX_SIZE (#499) f9f05e8d fix comments; delete dead code git-subtree-dir: gitstatus git-subtree-split: 7822a026b77fb810e74055836d62cbe5b133eade
This commit is contained in:
parent
242ccfaef8
commit
379240e2e4
|
|
@ -420,7 +420,7 @@ function gitstatus_query() {
|
|||
VCS_STATUS_COMMIT_SUMMARY="${resp[28]-}"
|
||||
VCS_STATUS_HAS_STAGED=$((VCS_STATUS_NUM_STAGED > 0))
|
||||
if (( _GITSTATUS_DIRTY_MAX_INDEX_SIZE >= 0 &&
|
||||
VCS_STATUS_INDEX_SIZE > _GITSTATUS_DIRTY_MAX_INDEX_SIZE_ )); then
|
||||
VCS_STATUS_INDEX_SIZE > _GITSTATUS_DIRTY_MAX_INDEX_SIZE )); then
|
||||
VCS_STATUS_HAS_UNSTAGED=-1
|
||||
VCS_STATUS_HAS_CONFLICTED=-1
|
||||
VCS_STATUS_HAS_UNTRACKED=-1
|
||||
|
|
|
|||
|
|
@ -151,7 +151,7 @@ class Arena {
|
|||
return DirectInit<std::remove_const_t<std::remove_reference_t<T>>>(std::forward<T>(val));
|
||||
}
|
||||
|
||||
// The same as `new T{args...}` but on the arena.
|
||||
// The same as `new T(args...)` but on the arena.
|
||||
template <class T, class... Args>
|
||||
inline T* DirectInit(Args&&... args) {
|
||||
T* res = Allocate<T>();
|
||||
|
|
@ -159,7 +159,7 @@ class Arena {
|
|||
return res;
|
||||
}
|
||||
|
||||
// The same as `new T(args...)` but on the arena.
|
||||
// The same as `new T{args...}` but on the arena.
|
||||
template <class T, class... Args>
|
||||
inline T* BraceInit(Args&&... args) {
|
||||
T* res = Allocate<T>();
|
||||
|
|
@ -194,7 +194,6 @@ class Arena {
|
|||
inline static size_t Align(size_t n, size_t m) { return (n + m - 1) & ~(m - 1); };
|
||||
|
||||
void AddBlock(size_t size, size_t alignment);
|
||||
bool ReuseBlock(size_t size, size_t alignment);
|
||||
|
||||
__attribute__((noinline)) void* AllocateSlow(size_t size, size_t alignment);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue