GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-13 12:33:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge bitcoin/bitcoin#22309: blockstorage: Add missing atomic include

Browse source 
fa2d21fec8 add missing atomic include (MarcoFalke)

Pull request description:

  `std::atomic` is used in the file, so to avoid compile issues, add the missing include.

ACKs for top commit:
  practicalswift:
    cr ACK fa2d21fec8
  jamesob:
    crACK https://github.com/bitcoin/bitcoin/pull/22309/commits/fa2d21fec8e532aa0781211e198ee6098f89350e
  hebasto:
    ACK fa2d21fec8, I have reviewed the code and it looks OK, I agree it can be merged.
  prayank23:
    crACK https://github.com/bitcoin/bitcoin/pull/22309/commits/fa2d21fec8e532aa0781211e198ee6098f89350e

Tree-SHA512: 307b15abd62006be4457b2437fb65de517c296bf0417e8acd181904eb6056dba5655dd5bc43b834bf68a087d06637f5e99ba5a6bc8be3e12388cea470dc155d0
This commit is contained in:
MarcoFalke 2021-06-22 15:52:13 +02:00
commit 327e2691f6
No known key found for this signature in database
GPG key ID: CE2B75697E69A548
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/node/blockstorage.h
View file

@ -5,12 +5,13 @@
#ifndef BITCOIN_NODE_BLOCKSTORAGE_H
#define BITCOIN_NODE_BLOCKSTORAGE_H
#include <cstdint>
#include <vector>
#include <fs.h>
#include <protocol.h> // For CMessageHeader::MessageStartChars
#include <atomic>
#include <cstdint>
#include <vector>
class ArgsManager;
class BlockValidationState;
class CBlock;