highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-11-12 15:09:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge #19314: refactor: Use uint16_t instead of unsigned short

Browse Source 
1cabbddbca refactor: Use uint16_t instead of unsigned short (Aaron Hook)

Pull request description:

  I wanted to see if the `up for grabs` label works and looked at PR #17822 originally opend by ahook I saw it had many acks for example by jonatack and practicalswift but needed rebasing.

  So I checked out the remote branch rebased it resolved three conflicts and continued the rebase.

  Hope everything is as expected (:

ACKs for top commit:
  sipsorcery:
    ACK 1cabbddbca.
  practicalswift:
    ACK 1cabbddbca -- patch looks correct :)
  laanwj:
    ACK 1cabbddbca
  hebasto:
    ACK 1cabbddbca, I have reviewed the code and it looks OK, I agree it can be merged.

Tree-SHA512: 0e6bf64f274aae5dacb188358b4d5f65ccb207d4f70922f039bc4ed7934709418ddad19f8bfb7462517427837c3d2bb3f86ef284bb40e87119aad2a1e148d9d6
This commit is contained in:
Wladimir J. van der Laan
2020-07-09 16:33:26 +02:00
parent 22ccc27046 1cabbddbca
commit 0d69fdb9a0
9 changed files with 28 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/net.h
View File

@@ -25,8 +25,8 @@
#include <uint256.h>
#include <atomic>
#include <cstdint>
#include <deque>
#include <stdint.h>
#include <thread>
#include <memory>
#include <condition_variable>
@@ -482,7 +482,7 @@ void Discover();
void StartMapPort();
void InterruptMapPort();
void StopMapPort();
unsigned short GetListenPort();
uint16_t GetListenPort();
struct CombinerAll
{