Skip to content

Remove filesystem/fstream from EXPECTED_BOOST_INCLUDES #14763

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Closed
Sjors wants to merge 1 commit into from
Closed

Remove filesystem/fstream from EXPECTED_BOOST_INCLUDES #14763

Sjors wants to merge 1 commit into from

Conversation

@Sjors
Copy link
Member

@Sjors Sjors commented Nov 19, 2018

#14718 caused the Travis linter machine to fail due to:

test/lint/lint-includes.sh
Good job! The Boost dependency "boost/filesystem/fstream.hpp" is no longer used.
Please remove it from EXPECTED_BOOST_INCLUDES in test/lint/lint-includes.sh
to make sure this dependency is not accidentally reintroduced.

@meshcollider
Copy link
Contributor

meshcollider commented Nov 19, 2018

utACK

@Sjors
Copy link
Member Author

Sjors commented Nov 19, 2018

Travis not happy:

In file included from bitcoind.cpp:13:0:
./fs.h:89:17: error: ‘ifstream’ in namespace ‘fs’ does not name a type
     typedef fs::ifstream ifstream;
                 ^
./fs.h:90:17: error: ‘ofstream’ in namespace ‘fs’ does not name a type
     typedef fs::ofstream ofstream;
                 ^
Makefile:8901: recipe for target 'bitcoind-bitcoind.o' failed

@maflcko
Copy link
Member

maflcko commented Nov 19, 2018

Hmm :( The one time you needed travis, it wasn't running.

@maflcko
Copy link
Member

maflcko commented Nov 19, 2018

I compiled locally, but if travis doesn't like it, please just revert https://github.com/bitcoin/bitcoin/pull/14718/files#diff-ef73d49954ee42b794bd5129a406a8b5L15

@kallewoof
Copy link
Contributor

kallewoof commented Nov 20, 2018 •
edited
Loading

Yeah, looks like you need

#include <boost/filesystem/fstream.hpp>

in fs.h for some architectures (e.g. Debian Jessie PPC).

@kallewoof kallewoof mentioned this pull request Nov 20, 2018
Merged
@meshcollider
Copy link
Contributor

meshcollider commented Nov 20, 2018

Closing in favour of #14768

laanwj added a commit that referenced this pull request Nov 20, 2018
@laanwj
Merge #14768: revert removal of fstream.hpp header in fs.h
1b99d15 
e816b34 revert removal of fstream.hpp header in fs.h (Karl-Johan Alm)

Pull request description:

  We cannot (yet) remove the EXPECTED_BOOST_INCLUDES entry as this header is still needed in `fs.h` (see #14763).

  Partially reverts #14718.

Tree-SHA512: e94d8d6208bee14af20a7a529e60a4898358ec8c070a8bf0701e589a2ae33df1305deac83cee619f103c24be0eb3c12a2f490209c125b247acf21561c7de456e
@Sjors Sjors deleted the 2018/11/expected_boost_includes branch November 20, 2018 13:16
Munkybooty pushed a commit to Munkybooty/dash that referenced this pull request Aug 11, 2021
@laanwj @Munkybooty
Merge bitcoin#14768: revert removal of fstream.hpp header in fs.h
de5d8af 
e816b34 revert removal of fstream.hpp header in fs.h (Karl-Johan Alm)

Pull request description:

  We cannot (yet) remove the EXPECTED_BOOST_INCLUDES entry as this header is still needed in `fs.h` (see bitcoin#14763).

  Partially reverts bitcoin#14718.

Tree-SHA512: e94d8d6208bee14af20a7a529e60a4898358ec8c070a8bf0701e589a2ae33df1305deac83cee619f103c24be0eb3c12a2f490209c125b247acf21561c7de456e
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Sep 8, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

No reviews

Assignees

No one assigned

Labels

Scripts and tools

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@Sjors @meshcollider @maflcko @kallewoof