From af7325470387578502b91c022a2f6d97addfa411 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9F=D0=B5=D0=BB=D0=B8=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE=20?= =?UTF-8?q?=D0=98=D0=B2=D0=B0=D0=BD?= Date: Sat, 12 May 2018 09:57:57 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/pip@614 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5 --- FindPIP.cmake | 6 +++++- src_main/containers/pimap.h | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/FindPIP.cmake b/FindPIP.cmake index 3760d545..44cc2074 100644 --- a/FindPIP.cmake +++ b/FindPIP.cmake @@ -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_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) -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_RC pip_rc HINTS ${PIP_DIR}/bin ${MINGW_BIN} /usr/bin /usr/local/bin) if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") diff --git a/src_main/containers/pimap.h b/src_main/containers/pimap.h index 3387eef5..9b6333b9 100644 --- a/src_main/containers/pimap.h +++ b/src_main/containers/pimap.h @@ -156,10 +156,14 @@ public: iterator end() {return iterator(this, size());} const_iterator begin() const {return const_iterator(this, 0);} 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 rend() {return reverse_iterator(this, -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 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();} int size_s() const {return pim_content.size_s();}