diff options
| -rw-r--r-- | CHANGELOG.txt | 2 | ||||
| -rw-r--r-- | zp/GNUmakefile | 2 | ||||
| -rw-r--r-- | zp/include-private/zp/imp/prv.ii | 4 | ||||
| -rw-r--r-- | zp/include-private/zp/prv | 4 | ||||
| -rw-r--r-- | zp/include/zp/imp/mem.ii | 2 |
5 files changed, 8 insertions, 6 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt index f8e501d..1af884e 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -147,6 +147,8 @@ * Implement cpy, equ, fil, and srh in C++11; * Use shared implementation files; +* Fix install target; + # 0.0.2 * Migrate to CMake; diff --git a/zp/GNUmakefile b/zp/GNUmakefile index 25ed550..f47c06c 100644 --- a/zp/GNUmakefile +++ b/zp/GNUmakefile @@ -232,7 +232,7 @@ install: $(LIB) mkdir -pvm755 "$(HDRDIR)/zp/prv" mkdir -pvm755 "$(LIBDIR)" install -vm644 "include/zp/"{"bas","mem","mth","str"}{"",".h"} "$(HDRDIR)/zp" - install -vm644 "include/zp/"{"bas","mem","mth","str"}".ii" "$(HDRDIR)/zp/imp" + install -vm644 "include/zp/imp/"{"bas","mem","mth","str"}".ii" "$(HDRDIR)/zp/imp" install -vm755 "$(LIB)" "$(LIBDIR)" clean: diff --git a/zp/include-private/zp/imp/prv.ii b/zp/include-private/zp/imp/prv.ii index e340c70..826252c 100644 --- a/zp/include-private/zp/imp/prv.ii +++ b/zp/include-private/zp/imp/prv.ii @@ -29,7 +29,7 @@ template<typename typ> zp_nthw ::zp::siz zp::det::strfil(typ * str,typ const chr //static_assert(::zp::ischrtyp<typ>::val,"type must be a character type"); /* If the string format uses multiple values per character, the number of these values is returned (use utfXdeclen if the number of characters is needed). */ typ * const srt = str; - + while (*str != typ (0x0)) {*str++ = chr;} return static_cast< ::zp::siz>(str-srt)-0x1u; @@ -39,7 +39,7 @@ template<typename typ> zp_nthw ::zp::siz zp::det::strlen(typ const * str) { //static_assert(::zp::ischrtyp<typ>::val,"type must be a character type"); /* If the string format uses multiple values per character, the number of these values is returned (use utfXdeclen if the number of characters is needed). */ typ const * const srt = str; - + while (*str++ != typ (0x0)) {} return static_cast< ::zp::siz>(str-srt)-0x1u; diff --git a/zp/include-private/zp/prv b/zp/include-private/zp/prv index 7317edc..b79a7b5 100644 --- a/zp/include-private/zp/prv +++ b/zp/include-private/zp/prv @@ -13,10 +13,10 @@ namespace zp { namespace det { template<typename typ> zp_nthw ::zp::siz strcpy(typ * dst, typ const * src); - template<typename typ> zp_nthw bool strequ(typ const * lstr,typ const * rsrc); + template<typename typ> zp_nthw bool strequ(typ const * lstr,typ const * rsrc); template<typename typ> zp_nthw ::zp::siz strfil(typ * dst, typ chr); template<typename typ> zp_nthw ::zp::siz strlen(typ const * str); - template<typename typ> zp_nthw typ * strsrh(typ const * str, typ chr); + template<typename typ> zp_nthw typ * strsrh(typ const * str, typ chr); } } diff --git a/zp/include/zp/imp/mem.ii b/zp/include/zp/imp/mem.ii index 2d5c329..2b7142f 100644 --- a/zp/include/zp/imp/mem.ii +++ b/zp/include/zp/imp/mem.ii @@ -48,7 +48,7 @@ template<typename dsttyp,typename srctyp> zp_nthw inline ::zp::cpyres<dsttyp,src #if zp_std_cxx11 template<typename buftyp,typename valtyp> constexpr auto zp::srh(buftyp * buf,valtyp & val,::zp::siz const num) noexcept -> buftyp * { buftyp * const stp = buf+num; - + while (buf != stp) { buftyp * const addr = buf++; zp_ulik (*addr == val) {return addr;} |