diff --git a/.github/actions/win-install/action.yml b/.github/actions/win-install/action.yml index 8f87ab8f8..3f8d5d140 100644 --- a/.github/actions/win-install/action.yml +++ b/.github/actions/win-install/action.yml @@ -4,7 +4,7 @@ runs: using: composite steps: - name: Install packages - run: vcpkg install bzip2:x64-windows expat:x64-windows zlib:x64-windows proj4:x64-windows boost-algorithm:x64-windows boost-system:x64-windows boost-filesystem:x64-windows boost-property-tree:x64-windows lua:x64-windows libpq:x64-windows + run: vcpkg install bzip2:x64-windows expat:x64-windows zlib:x64-windows proj4:x64-windows boost-system:x64-windows boost-filesystem:x64-windows boost-property-tree:x64-windows lua:x64-windows libpq:x64-windows shell: bash - name: Install psycopg2 run: python -m pip install psycopg2 diff --git a/src/tagtransform-c.cpp b/src/tagtransform-c.cpp index 0a01a49a8..13476c5ee 100644 --- a/src/tagtransform-c.cpp +++ b/src/tagtransform-c.cpp @@ -7,7 +7,6 @@ * For a full list of authors see the git log. */ -#include #include #include @@ -99,6 +98,11 @@ std::unique_ptr c_tagtransform_t::clone() const return std::make_unique(m_options, m_export_list); } +static bool starts_with(char const *input, std::string const& test) noexcept +{ + return std::strncmp(input, test.c_str(), test.size()) == 0; +} + bool c_tagtransform_t::check_key(std::vector const &infos, char const *k, bool *filter, unsigned int *flags) @@ -131,7 +135,7 @@ bool c_tagtransform_t::check_key(std::vector const &infos, if (!m_options->hstore_columns.empty()) { /* does this column match any of the hstore column prefixes? */ for (auto const &column : m_options->hstore_columns) { - if (boost::starts_with(k, column)) { + if (starts_with(k, column)) { /* ... but if hstore_match_only is set then don't take this as a reason for keeping the object */ if (!m_options->hstore_match_only) {