Rename expected.h to vcpkg_expected.h
MODIFY
include/Paragraphs.h
include/Paragraphs.h
#include "filesystem_fs.h"
#include <map>
-#include "expected.h"
+#include "vcpkg_expected.h"
#include "BinaryParagraph.h"
#include "vcpkg_paths.h"

MODIFY
include/package_spec.h
include/package_spec.h
#pragma once
#include "package_spec_parse_result.h"
#include "triplet.h"
-#include "expected.h"
+#include "vcpkg_expected.h"
namespace vcpkg
{

MODIFY
include/vcpkg_Files.h
include/vcpkg_Files.h
#pragma once
-#include "expected.h"
+#include "vcpkg_expected.h"
#include "filesystem_fs.h"
#include <iterator>

RENAME
include/expected.h
include/vcpkg_expected.h
MODIFY
include/vcpkg_paths.h
include/vcpkg_paths.h
#pragma once
#include "filesystem_fs.h"
-#include "expected.h"
+#include "vcpkg_expected.h"
#include "package_spec.h"
#include "BinaryParagraph.h"
#include "lazy.h"

MODIFY
vcpkglib/vcpkglib.vcxproj
vcpkglib/vcpkglib.vcxproj
<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" />

MODIFY
vcpkglib/vcpkglib.vcxproj.filters
vcpkglib/vcpkglib.vcxproj.filters
<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>
<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

Rename expected.h to vcpkg_expected.h