mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-18 13:13:34 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Rename expected.h to vcpkg_expected.h

Browse Source
This commit is contained in:
Alexander Karatarakis 2017-03-31 16:33:10 -07:00
parent 7d4832c6bf
commit e9ca24b219
7 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
toolsrc/include/Paragraphs.h
View File

@ -2,7 +2,7 @@
#include "filesystem_fs.h"
#include <map>
#include "expected.h"
#include "vcpkg_expected.h"
#include "BinaryParagraph.h"
#include "vcpkg_paths.h"

2
toolsrc/include/package_spec.h
View File

@ -1,7 +1,7 @@
#pragma once
#include "package_spec_parse_result.h"
#include "triplet.h"
#include "expected.h"
#include "vcpkg_expected.h"
namespace vcpkg
{

2
toolsrc/include/vcpkg_Files.h
View File

@ -1,6 +1,6 @@
#pragma once
#include "expected.h"
#include "vcpkg_expected.h"
#include "filesystem_fs.h"
#include <iterator>

2
toolsrc/include/expected.h → toolsrc/include/vcpkg_expected.h
View File

@ -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()
{
}

2
toolsrc/include/vcpkg_paths.h
View File

@ -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"

2
toolsrc/vcpkglib/vcpkglib.vcxproj
View File

@ -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" />

6
toolsrc/vcpkglib/vcpkglib.vcxproj.filters
View File

@ -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>