github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-11 22:03:01 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

New Core fixes

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@9778 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2016-05-03 09:01:49 +00:00
parent facc786a66
commit 0c06e34abe
3 changed files with 24 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

8
uppsrc/Core/InVector.h
View file

@ -39,6 +39,8 @@ private:
uint16 blk_low;
uint16 slave;
void Pick(InVector&& b);
InVectorSlave__ *Slave() { return (InVectorSlave__ *)((byte *)this + slave); }
void SetSlave(InVectorSlave__ *s) { slave = (uint16)((byte *)s - (byte *)this); }
@ -48,7 +50,7 @@ private:
int FindBlock(int& pos, int& off) const;
int FindBlock(int& pos) const;
void SetBlkPar();
template <class L>
int FindUpperBound(const T& val, const L& less, int& off, int& pos) const;
@ -139,9 +141,9 @@ public:
Iterator end() { Iterator it; SetEnd(it); return it; }
InVector();
InVector(InVector&& v) { Pick(pick(v)); }
void operator=(InVector&& v) { Pick(pick(v)); }
InVector(const InVector& v, int);
InVector(std::initializer_list<T> init) { Init(); for(const auto& i : init) Add(i); }
void Swap(InVector& b);

16
uppsrc/Core/InVector.hpp
View file

@ -466,6 +466,22 @@ InVector<T>::InVector(const InVector<T>& v, int)
slave = v.slave;
}
template <class T>
void InVector<T>::Pick(InVector&& v)
{
data = pick(v.data);
index = pick(v.index);
count = v.count;
hcount = v.hcount;
blk_high = v.blk_high;
blk_low = v.blk_low;
serial = v.serial;
slave = v.slave;
v.Init();
}
template <class T>
template <class L>
int InVector<T>::FindUpperBound(const T& val, const L& less, int& off, int& pos) const

12
uppsrc/Core/todo.txt
View file

@ -1,15 +1,6 @@
CLANG11 autotest/ValueRef : FAILED
CLANG11 autotest/RangeInsertTest : TIMEOUT
CLANG11 autotest/LambdaCallback : FAILED
CLANG11 autotest/Qtf : FAILED
CLANG11 autotest/StringBuffer2GB : ERROR
CLANG11 autotest/CheckDownloads : FAILED
CLANG11 autotest/Core11 : FAILED
CLANG11 autotest/CompareContainer : FAILED
CLANG11 reference/SocketServer : ERROR
CLANG11 reference/Cv : ERROR
CLANG11 reference/CallbackPickClone : ERROR
CLANG11 reference/BasicAlgo : ERROR
CLANG11 reference/Log : ERROR
CLANG11 reference/Tuple : ERROR
CLANG11 reference/SocketClient : ERROR
@ -20,7 +11,10 @@ CLANG11 upptst/idetest : ERROR
CLANG11 upptst/Zip : ERROR
CLANG11 tutorial/Ntl10 : ERROR
uppbox
CLANG11 reference/CallbackPickClone : ERROR
CLANG11 autotest/CallbackPick : ERROR
oportunity &&