diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-06-08 04:36:11 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2017-06-08 04:36:11 -0700 |
| commit | 44a995d4461c54f0ff838af2649b618c533e60b7 (patch) | |
| tree | 0bb02f806780f4d7d2afb2cb1637fccbaf304606 /toolsrc/include | |
| parent | 247a6cec90004b8666d155eacc0f27d3a6c8fcf9 (diff) | |
| download | vcpkg-44a995d4461c54f0ff838af2649b618c533e60b7.tar.gz vcpkg-44a995d4461c54f0ff838af2649b618c533e60b7.zip | |
[vcpkg] Hotfix previous commit.
Diffstat (limited to 'toolsrc/include')
| -rw-r--r-- | toolsrc/include/SourceParagraph.h | 2 | ||||
| -rw-r--r-- | toolsrc/include/vcpkg_Strings.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/toolsrc/include/SourceParagraph.h b/toolsrc/include/SourceParagraph.h index 47ad5b830..2f30e338e 100644 --- a/toolsrc/include/SourceParagraph.h +++ b/toolsrc/include/SourceParagraph.h @@ -78,7 +78,7 @@ namespace vcpkg V141, }; - bool supports(Architecture arch, Platform plat, Linkage crt, ToolsetVersion tools); + bool is_supported(Architecture arch, Platform plat, Linkage crt, ToolsetVersion tools); private: std::vector<Architecture> architectures; diff --git a/toolsrc/include/vcpkg_Strings.h b/toolsrc/include/vcpkg_Strings.h index cab8071aa..e95a0601a 100644 --- a/toolsrc/include/vcpkg_Strings.h +++ b/toolsrc/include/vcpkg_Strings.h @@ -61,7 +61,7 @@ namespace vcpkg::Strings template<class Container, class Transformer, class CharType> std::basic_string<CharType> join(const CharType* delimiter, const Container& v, Transformer transformer) { - if (v.empty()) + if (v.size() == 0) { return std::basic_string<CharType>(); } |
