diff options
| author | merge-script <fanquake@gmail.com> | 2024-04-27 14:48:54 +0800 |
|---|---|---|
| committer | merge-script <fanquake@gmail.com> | 2024-04-27 14:48:54 +0800 |
| commit | 7fee0ca014b1513e836d2550d1b7512739d5a79a (patch) | |
| tree | 29479d5ffd541e2c37c4721529363bd504e2307b | |
| parent | 1ffbd96349820cae7f076ae3253d8a9d28155fd2 (diff) | |
| parent | 97a4ad5713853f51c729cced73f133fafa735ba2 (diff) | |
| download | bitcoin-7fee0ca014b1513e836d2550d1b7512739d5a79a.tar.xz | |
Merge bitcoin/bitcoin#29976: build, msvc: Drop duplicated `common\url.cpp` source file
97a4ad5713853f51c729cced73f133fafa735ba2 build, msvc: Drop duplicated `common\url.cpp` source file (Hennadii Stepanov)
Pull request description:
After https://github.com/bitcoin/bitcoin/pull/29904, the `common\url.cpp` source file is included into the `SOURCE_FILES` by the `msvc-autogen.py` script.
Removes a compiler [warning](https://github.com/bitcoin/bitcoin/actions/runs/8853698173/job/24315127236#step:20:1776):
```
url.obj : warning LNK4006: "class std::basic_string<char,struct std::char_traits<char>,class std::allocator<char> > __cdecl UrlDecode(class std::basic_string_view<char,struct std::char_traits<char> >)" (?UrlDecode@@YA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$basic_string_view@DU?$char_traits@D@std@@@2@@Z) already defined in common_url.obj; second definition ignored [D:\a\bitcoin\bitcoin\build_msvc\libbitcoin_common\libbitcoin_common.vcxproj]
```
ACKs for top commit:
fanquake:
ACK 97a4ad5713853f51c729cced73f133fafa735ba2
Tree-SHA512: 294955d6e6940b48a429e2302fb456706a5c62515d479398036b40716ee6b722535876adeb9b988ddb8fc942fabc39fe358c50eff0baaae92bd24bbeb4362885
| -rw-r--r-- | build_msvc/libbitcoin_common/libbitcoin_common.vcxproj.in | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/build_msvc/libbitcoin_common/libbitcoin_common.vcxproj.in b/build_msvc/libbitcoin_common/libbitcoin_common.vcxproj.in index 482e4333f7..b47d62b295 100644 --- a/build_msvc/libbitcoin_common/libbitcoin_common.vcxproj.in +++ b/build_msvc/libbitcoin_common/libbitcoin_common.vcxproj.in @@ -8,7 +8,6 @@ <ConfigurationType>StaticLibrary</ConfigurationType> </PropertyGroup> <ItemGroup> - <ClCompile Include="..\..\src\common\url.cpp" /> @SOURCE_FILES@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> |