aboutsummaryrefslogtreecommitdiff
path: root/toolsrc/include
diff options
context:
space:
mode:
authordevel <alexander.kaspar@gmail.com>2016-11-27 07:54:53 +0100
committerdevel <alexander.kaspar@gmail.com>2016-11-27 07:54:53 +0100
commit5ba4567c0261eab34c968b302f6d58b48bd82699 (patch)
tree498963c5f3ca10a618ec00067e88e475b7b12779 /toolsrc/include
parent877b237f6f22fdc098051f550c7b9dcf26afe3ec (diff)
parentbc8a015889caa63c4d3ebac06714b1b5601e638e (diff)
downloadvcpkg-5ba4567c0261eab34c968b302f6d58b48bd82699.tar.gz
vcpkg-5ba4567c0261eab34c968b302f6d58b48bd82699.zip
Merge branch 'master' of https://github.com/Microsoft/vcpkg into qca
Diffstat (limited to 'toolsrc/include')
-rw-r--r--toolsrc/include/BuildInfo.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/toolsrc/include/BuildInfo.h b/toolsrc/include/BuildInfo.h
index 22b4bed7d..7f64c51cc 100644
--- a/toolsrc/include/BuildInfo.h
+++ b/toolsrc/include/BuildInfo.h
@@ -46,8 +46,8 @@ namespace vcpkg
const ConfigurationType& config() const;
const LinkageType& linkage() const;
- const std::regex& crt_regex() const;
- const std::string& toString() const;
+ const std::regex crt_regex() const;
+ const std::string toString() const;
private:
BuildType(const ConfigurationType& config, const LinkageType& linkage, const std::string& crt_regex_as_string)
@@ -106,7 +106,7 @@ namespace vcpkg
OutdatedDynamicCrt() = delete;
- const std::regex& crt_regex() const;
+ const std::regex crt_regex() const;
const std::string& toString() const;
private: