Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions .clang-format
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
BasedOnStyle: WebKit
Language: Cpp
Standard: Cpp11

UseTab: Never
IndentWidth: 4
Expand Down Expand Up @@ -75,3 +73,8 @@ IncludeCategories:
Priority: 6
- Regex: '^<[a-z0-9_]*>$' # C++ standard library
Priority: 7

---

Language: Cpp
Standard: c++17
10 changes: 4 additions & 6 deletions include/vcpkg/base/diagnostics.h
Original file line number Diff line number Diff line change
Expand Up @@ -311,9 +311,8 @@ namespace vcpkg

// The overload for functors that return Optional<T>
template<class Fn, class... Args>
auto adapt_context_to_expected(Fn functor, Args&&... args)
-> ExpectedL<
typename AdaptContextUnwrapOptional<std::invoke_result_t<Fn, BufferedDiagnosticContext&, Args...>>::type>
auto adapt_context_to_expected(Fn functor, Args&&... args) -> ExpectedL<
typename AdaptContextUnwrapOptional<std::invoke_result_t<Fn, BufferedDiagnosticContext&, Args...>>::type>
{
using Unwrapper = AdaptContextUnwrapOptional<std::invoke_result_t<Fn, BufferedDiagnosticContext&, Args...>>;
using ReturnType = ExpectedL<typename Unwrapper::type>;
Expand Down Expand Up @@ -381,9 +380,8 @@ namespace vcpkg

// The overload for functors that return std::unique_ptr<T>
template<class Fn, class... Args>
auto adapt_context_to_expected(Fn functor, Args&&... args)
-> ExpectedL<
typename AdaptContextDetectUniquePtr<std::invoke_result_t<Fn, BufferedDiagnosticContext&, Args...>>::type>
auto adapt_context_to_expected(Fn functor, Args&&... args) -> ExpectedL<
typename AdaptContextDetectUniquePtr<std::invoke_result_t<Fn, BufferedDiagnosticContext&, Args...>>::type>
{
using ReturnType = ExpectedL<
typename AdaptContextDetectUniquePtr<std::invoke_result_t<Fn, BufferedDiagnosticContext&, Args...>>::type>;
Expand Down
2 changes: 1 addition & 1 deletion src/vcpkg-test/json.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
template<size_t Sz>
static auto u8_string_to_char_string(const char8_t (&literal)[Sz]) -> const char (&)[Sz]
{
return reinterpret_cast<const char(&)[Sz]>(literal);
return reinterpret_cast<const char (&)[Sz]>(literal);
}

#define U8_STR(s) (u8_string_to_char_string(u8"" s))
Expand Down
2 changes: 1 addition & 1 deletion src/vcpkg/base/json.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ namespace vcpkg::Json

private:
template<class T>
ValueImpl& internal_assign(ValueKind vk, T ValueImpl::*mp, ValueImpl& other) noexcept
ValueImpl& internal_assign(ValueKind vk, T ValueImpl::* mp, ValueImpl& other) noexcept
{
if (tag == vk)
{
Expand Down
4 changes: 2 additions & 2 deletions src/vcpkg/base/system.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -208,8 +208,8 @@ namespace vcpkg
const HMODULE hKernel32 = ::GetModuleHandleW(L"kernel32.dll");
if (hKernel32)
{
BOOL(__stdcall* const isWow64Process2)
(HANDLE /* hProcess */, USHORT* /* pProcessMachine */, USHORT* /*pNativeMachine*/) =
BOOL(__stdcall* const isWow64Process2)(
HANDLE /* hProcess */, USHORT* /* pProcessMachine */, USHORT* /*pNativeMachine*/) =
reinterpret_cast<decltype(isWow64Process2)>(::GetProcAddress(hKernel32, "IsWow64Process2"));
if (isWow64Process2)
{
Expand Down
Loading