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

git-svn-id: svn://db.shs.com.ru/pip@614 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

Browse Source
This commit is contained in:
Пелипенко Иван
2018-05-12 09:57:57 +00:00
parent 62f0942e2d
commit af73254703
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
FindPIP.cmake
View File

@@ -8,7 +8,11 @@ find_library(PIP_CRYPT_LIBRARY pip_crypt HINTS ${PIP_DIR}/lib ${MINGW_LIB} /usr/
find_library(PIP_FFTW_LIBRARY pip_fftw HINTS ${PIP_DIR}/lib ${MINGW_LIB} /usr/lib /usr/local/lib) find_library(PIP_FFTW_LIBRARY pip_fftw HINTS ${PIP_DIR}/lib ${MINGW_LIB} /usr/lib /usr/local/lib)
find_library(PIP_COMPRESS_LIBRARY pip_compress HINTS ${PIP_DIR}/lib ${MINGW_LIB} /usr/lib /usr/local/lib) find_library(PIP_COMPRESS_LIBRARY pip_compress HINTS ${PIP_DIR}/lib ${MINGW_LIB} /usr/lib /usr/local/lib)
find_file(PIP_H_INCLUDE "pip.h" HINTS ${PIP_DIR}/include/pip ${MINGW_INCLUDE}/pip /usr/include/pip /usr/local/include/pip) find_file(PIP_H_INCLUDE "pip.h" HINTS ${PIP_DIR}/include/pip ${MINGW_INCLUDE}/pip /usr/include/pip /usr/local/include/pip)
get_filename_component(PIP_INCLUDES ${PIP_H_INCLUDE} PATH) if (DEFINED ANDROID_PLATFORM)
set(PIP_INCLUDES ${ANDROID_SYSTEM_LIBRARY_PATH}/usr/include/pip)
else()
get_filename_component(PIP_INCLUDES ${PIP_H_INCLUDE} PATH)
endif()
find_program(PIP_CMG pip_cmg HINTS ${PIP_DIR}/bin ${MINGW_BIN} /usr/bin /usr/local/bin) find_program(PIP_CMG pip_cmg HINTS ${PIP_DIR}/bin ${MINGW_BIN} /usr/bin /usr/local/bin)
find_program(PIP_RC pip_rc HINTS ${PIP_DIR}/bin ${MINGW_BIN} /usr/bin /usr/local/bin) find_program(PIP_RC pip_rc HINTS ${PIP_DIR}/bin ${MINGW_BIN} /usr/bin /usr/local/bin)
if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")

4
src_main/containers/pimap.h
View File

@@ -156,10 +156,14 @@ public:
iterator end() {return iterator(this, size());} iterator end() {return iterator(this, size());}
const_iterator begin() const {return const_iterator(this, 0);} const_iterator begin() const {return const_iterator(this, 0);}
const_iterator end() const {return const_iterator(this, size());} const_iterator end() const {return const_iterator(this, size());}
const_iterator constBegin() const {return const_iterator(this, 0);}
const_iterator constEnd() const {return const_iterator(this, size());}
reverse_iterator rbegin() {return reverse_iterator(this, size() - 1);} reverse_iterator rbegin() {return reverse_iterator(this, size() - 1);}
reverse_iterator rend() {return reverse_iterator(this, -1);} reverse_iterator rend() {return reverse_iterator(this, -1);}
const_reverse_iterator rbegin() const {return const_reverse_iterator(this, size() - 1);} const_reverse_iterator rbegin() const {return const_reverse_iterator(this, size() - 1);}
const_reverse_iterator rend() const {return const_reverse_iterator(this, -1);} const_reverse_iterator rend() const {return const_reverse_iterator(this, -1);}
const_reverse_iterator constRbegin() const {return const_reverse_iterator(this, size() - 1);}
const_reverse_iterator constRend() const {return const_reverse_iterator(this, -1);}
size_t size() const {return pim_content.size();} size_t size() const {return pim_content.size();}
int size_s() const {return pim_content.size_s();} int size_s() const {return pim_content.size_s();}