SHS/pip
4
3
Fork 0
Code Issues 67 Pull Requests 1 Actions Releases Wiki Activity

version 1.19.0_alpha

Browse Source 
general bug fixes and optimization
Merge branch 'master' of https://git.shs.tools/SHS/pip
This commit is contained in:
Пелипенко Иван
2020-06-09 18:04:33 +03:00
parent 4ec87e0e2a 2c6f87839c
commit f579718e0b
3 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.0)
cmake_policy(SET CMP0017 NEW) # need include() with .cmake cmake_policy(SET CMP0017 NEW) # need include() with .cmake
project(pip) project(pip)
set(_PIP_MAJOR 1) set(_PIP_MAJOR 1)
set(_PIP_MINOR 18) set(_PIP_MINOR 19)
set(_PIP_REVISION 0) set(_PIP_REVISION 0)
set(_PIP_SUFFIX alpha) set(_PIP_SUFFIX alpha)
set(_PIP_COMPANY SHS) set(_PIP_COMPANY SHS)

2
src_main/containers/pimap.h
View File

@@ -197,7 +197,7 @@ public:
const T at(const Key & key) const {return (*this)[key];} const T at(const Key & key) const {return (*this)[key];}
PIMap<Key, T> & operator <<(const PIMap<Key, T> & other) { PIMap<Key, T> & operator <<(const PIMap<Key, T> & other) {
if (&other == this) return *this; assert(&other != this);
if (other.isEmpty()) return *this; if (other.isEmpty()) return *this;
if (other.size() == 1) {insert(other.pim_index[0].key, other.pim_content[0]); return *this;} if (other.size() == 1) {insert(other.pim_index[0].key, other.pim_content[0]); return *this;}
if (other.size() == 2) {insert(other.pim_index[0].key, other.pim_content[0]); insert(other.pim_index[1].key, other.pim_content[1]); return *this;} if (other.size() == 2) {insert(other.pim_index[0].key, other.pim_content[0]); insert(other.pim_index[1].key, other.pim_content[1]); return *this;}

8
src_main/core/pistring.h
View File

@@ -869,18 +869,10 @@ public:
//! Compare operator //! Compare operator
bool operator !=(const PIStringList & o) const {return !(o == (*this));} bool operator !=(const PIStringList & o) const {return !(o == (*this));}
//PIStringList & operator =(const PIStringList & o) {clear(); for (uint i = 0; i < o.size(); ++i) *this << o[i]; return *this;}
PIStringList & operator =(const PIStringList & o) {PIDeque<PIString>::operator=(o); return *this;} PIStringList & operator =(const PIStringList & o) {PIDeque<PIString>::operator=(o); return *this;}
PIStringList & operator <<(const PIString & str) {append(str); return *this;} PIStringList & operator <<(const PIString & str) {append(str); return *this;}
PIStringList & operator <<(const PIStringList & sl) {append(sl); return *this;} PIStringList & operator <<(const PIStringList & sl) {append(sl); return *this;}
// inline PIStringList & operator <<(const char c) {push_back(PIString(c)); return *this;}
// PIStringList & operator <<(const char * str) {push_back(PIString(str)); return *this;}
// PIStringList & operator <<(const int & num) {push_back(PIString::fromNumber(num)); return *this;}
// PIStringList & operator <<(const short & num) {push_back(PIString::fromNumber(num)); return *this;}
// PIStringList & operator <<(const long & num) {push_back(PIString::fromNumber(num)); return *this;}
// PIStringList & operator <<(const float & num) {push_back(PIString::fromNumber(num)); return *this;}
// PIStringList & operator <<(const double & num) {push_back(PIString::fromNumber(num)); return *this;}
}; };