Skip to content

Commit b29eea5

Browse files
committed
Make using import std; compatible with Resharper
1 parent 01aa23a commit b29eea5

7 files changed

+21
-9
lines changed

src/buffered_stream_reader.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ import <win.h>;
1212
import errors;
1313
import util;
1414

15+
using std::uint32_t;
16+
1517
constexpr UINT MAX_BUFFER_SIZE = 65536;
1618

1719

src/dll_main.cpp

+9-8
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import util;
1616

1717
using std::array;
1818
using std::format;
19+
using std::uint32_t;
1920
using std::wstring;
2021
using namespace std::string_literals;
2122

@@ -88,15 +89,15 @@ void register_decoder_file_extension(const wchar_t* file_type_name, const wchar_
8889
L"PhotoViewer.FileAssoc.Tiff");
8990
}
9091

91-
void register_decoder_pattern(const wstring& sub_key, const int index, const std::span<const std::byte> pattern)
92+
void register_decoder_pattern(const wstring& sub_key, const int index, const std::span<const std::byte> pattern)
9293
{
93-
const wstring patterns_sub_key{sub_key + LR"(\Patterns\)" + std::to_wstring(index)};
94-
constexpr array mask{0xFF_byte, 0xFF_byte};
95-
registry::set_value(patterns_sub_key, L"Length", static_cast<uint32_t>(pattern.size()));
96-
registry::set_value(patterns_sub_key, L"Position", 0U);
97-
registry::set_value(patterns_sub_key, L"Mask", mask);
98-
registry::set_value(patterns_sub_key, L"Pattern", pattern);
99-
}
94+
const wstring patterns_sub_key{sub_key + LR"(\Patterns\)" + std::to_wstring(index)};
95+
constexpr array mask{0xFF_byte, 0xFF_byte};
96+
registry::set_value(patterns_sub_key, L"Length", static_cast<uint32_t>(pattern.size()));
97+
registry::set_value(patterns_sub_key, L"Position", 0U);
98+
registry::set_value(patterns_sub_key, L"Mask", mask);
99+
registry::set_value(patterns_sub_key, L"Pattern", pattern);
100+
}
100101

101102
void register_decoder()
102103
{

src/intellisense.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#pragma once
55

66
// Include explicit headers as workaround that IntelliSense in VS 2022 17.12 fails to parse #import <win.h>
7-
#ifdef __INTELLISENSE__
7+
#if defined(__INTELLISENSE__) || defined(__RESHARPER__)
88
#define _AMD64_
99
#include <combaseapi.h>
1010
#include <libloaderapi.h>

src/netpbm_bitmap_decoder.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ module;
77

88
module netpbm_bitmap_decoder;
99

10+
import std;
1011
import <win.h>;
1112
import winrt;
1213

@@ -17,6 +18,7 @@ import guids;
1718
import netpbm_bitmap_frame_decode;
1819
import util;
1920

21+
using std::uint32_t;
2022
using std::scoped_lock;
2123
using winrt::check_hresult;
2224
using winrt::com_ptr;

src/netpbm_bitmap_decoder.ixx

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// Copyright (c) Victor Derks.
22
// SPDX-License-Identifier: MIT
3+
34
export module netpbm_bitmap_decoder;
45

56
import <win.h>;

src/netpbm_bitmap_frame_decode.cpp

+3
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ module;
77

88
module netpbm_bitmap_frame_decode;
99

10+
import std;
1011
import <win.h>;
1112
import winrt;
1213

@@ -17,6 +18,8 @@ import util;
1718

1819
using std::span;
1920
using std::uint16_t;
21+
using std::int32_t;
22+
using std::uint32_t;
2023
using winrt::check_hresult;
2124
using winrt::com_ptr;
2225
using winrt::throw_hresult;

src/netpbm_bitmap_frame_decode.ixx

+3
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,12 @@ module;
77

88
export module netpbm_bitmap_frame_decode;
99

10+
import std;
1011
import <win.h>;
1112
import winrt;
1213

14+
using std::uint32_t;
15+
1316
export struct netpbm_bitmap_frame_decode
1417
: winrt::implements<netpbm_bitmap_frame_decode, IWICBitmapFrameDecode, IWICBitmapSource>
1518
{

0 commit comments

Comments
 (0)