diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2017-03-31 16:33:10 -0700 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2017-03-31 16:33:10 -0700 |
| commit | e9ca24b21991b27111543f767f2f171927a87414 (patch) | |
| tree | 2d4f5bb70a9766507bddc4546f04e25799107b5f | |
| parent | 7d4832c6bf1cb42097f4c0e2c7dc991d7984155a (diff) | |
| download | vcpkg-e9ca24b21991b27111543f767f2f171927a87414.tar.gz vcpkg-e9ca24b21991b27111543f767f2f171927a87414.zip | |
Rename expected.h to vcpkg_expected.h
| -rw-r--r-- | toolsrc/include/Paragraphs.h | 2 | ||||
| -rw-r--r-- | toolsrc/include/package_spec.h | 2 | ||||
| -rw-r--r-- | toolsrc/include/vcpkg_Files.h | 2 | ||||
| -rw-r--r-- | toolsrc/include/vcpkg_expected.h (renamed from toolsrc/include/expected.h) | 2 | ||||
| -rw-r--r-- | toolsrc/include/vcpkg_paths.h | 2 | ||||
| -rw-r--r-- | toolsrc/vcpkglib/vcpkglib.vcxproj | 2 | ||||
| -rw-r--r-- | toolsrc/vcpkglib/vcpkglib.vcxproj.filters | 6 |
7 files changed, 9 insertions, 9 deletions
diff --git a/toolsrc/include/Paragraphs.h b/toolsrc/include/Paragraphs.h index 74f8218ca..776728f7a 100644 --- a/toolsrc/include/Paragraphs.h +++ b/toolsrc/include/Paragraphs.h @@ -2,7 +2,7 @@ #include "filesystem_fs.h" #include <map> -#include "expected.h" +#include "vcpkg_expected.h" #include "BinaryParagraph.h" #include "vcpkg_paths.h" diff --git a/toolsrc/include/package_spec.h b/toolsrc/include/package_spec.h index 1bc493756..ead05cb99 100644 --- a/toolsrc/include/package_spec.h +++ b/toolsrc/include/package_spec.h @@ -1,7 +1,7 @@ #pragma once #include "package_spec_parse_result.h" #include "triplet.h" -#include "expected.h" +#include "vcpkg_expected.h" namespace vcpkg { diff --git a/toolsrc/include/vcpkg_Files.h b/toolsrc/include/vcpkg_Files.h index 0b0373231..9afb9eeec 100644 --- a/toolsrc/include/vcpkg_Files.h +++ b/toolsrc/include/vcpkg_Files.h @@ -1,6 +1,6 @@ #pragma once -#include "expected.h" +#include "vcpkg_expected.h" #include "filesystem_fs.h" #include <iterator> diff --git a/toolsrc/include/expected.h b/toolsrc/include/vcpkg_expected.h index 24257dcbf..3ab750cad 100644 --- a/toolsrc/include/expected.h +++ b/toolsrc/include/vcpkg_expected.h @@ -9,7 +9,7 @@ namespace vcpkg class expected { public: - // Constructors are intentionally implicit + // Constructors are intentionally implicit expected(const std::error_code& ec) : m_error_code(ec), m_t() { } diff --git a/toolsrc/include/vcpkg_paths.h b/toolsrc/include/vcpkg_paths.h index 99fd14905..ae91a8e2f 100644 --- a/toolsrc/include/vcpkg_paths.h +++ b/toolsrc/include/vcpkg_paths.h @@ -1,6 +1,6 @@ #pragma once #include "filesystem_fs.h" -#include "expected.h" +#include "vcpkg_expected.h" #include "package_spec.h" #include "BinaryParagraph.h" #include "lazy.h" diff --git a/toolsrc/vcpkglib/vcpkglib.vcxproj b/toolsrc/vcpkglib/vcpkglib.vcxproj index 9fb4641b9..96ed23633 100644 --- a/toolsrc/vcpkglib/vcpkglib.vcxproj +++ b/toolsrc/vcpkglib/vcpkglib.vcxproj @@ -143,7 +143,7 @@ <ClInclude Include="..\include\PostBuildLint_BuildInfo.h" /> <ClInclude Include="..\include\PostBuildLint_BuildPolicies.h" /> <ClInclude Include="..\include\coff_file_reader.h" /> - <ClInclude Include="..\include\expected.h" /> + <ClInclude Include="..\include\vcpkg_expected.h" /> <ClInclude Include="..\include\filesystem_fs.h" /> <ClInclude Include="..\include\ImmutableSortedVector.h" /> <ClInclude Include="..\include\MachineType.h" /> diff --git a/toolsrc/vcpkglib/vcpkglib.vcxproj.filters b/toolsrc/vcpkglib/vcpkglib.vcxproj.filters index 3474e221b..83656ff78 100644 --- a/toolsrc/vcpkglib/vcpkglib.vcxproj.filters +++ b/toolsrc/vcpkglib/vcpkglib.vcxproj.filters @@ -239,9 +239,6 @@ <ClInclude Include="..\include\vcpkglib.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="..\include\expected.h"> - <Filter>Header Files</Filter> - </ClInclude> <ClInclude Include="..\include\ImmutableSortedVector.h"> <Filter>Header Files</Filter> </ClInclude> @@ -308,5 +305,8 @@ <ClInclude Include="..\include\paragraph_parse_result.h"> <Filter>Header Files</Filter> </ClInclude> + <ClInclude Include="..\include\vcpkg_expected.h"> + <Filter>Header Files</Filter> + </ClInclude> </ItemGroup> </Project>
\ No newline at end of file |