Skip to content
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.

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

rpc: Compile on GCC4.8 #15248

Merged
merged 1 commit into from Jan 28, 2019
Merged

Conversation

@MarcoFalke
Copy link
Member

@MarcoFalke MarcoFalke commented Jan 25, 2019

GCC 4.8 is lacking some C++11 signatures (see "Adjust C++11 signatures to take a const_iterator." in GCC 4.9: gcc-mirror/gcc@3d2b2f4)

Fix that by changing the code to use the pre-GCC 4.9 signature.

Can be reverted after #13356.

Fixes #15172 (reports on Linux Mint 17.3 Rosa and CentOS Linux release 7.5.1804 (Core))

@Empact
Copy link
Member

@Empact Empact commented Jan 25, 2019

utACK fa27cdd I also ran into this working on building against Trusty #14998

nit: maybe add a comment calling out the temporary fix?

@DrahtBot
Copy link
Contributor

@DrahtBot DrahtBot commented Jan 25, 2019

The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

Conflicts

No conflicts as of last run.

@laanwj
Copy link
Member

@laanwj laanwj commented Jan 27, 2019

I guess this is no longer necessary after #15262? Or is this entirely for backport to 0.17.2?

Oh I misread, that is tagged 0.19.0.

@laanwj
Copy link
Member

@laanwj laanwj commented Jan 27, 2019

utACK, though I'd prefer to separate the refactoring/renaming commit from the actual change

         LOCK(g_rpc_server_info.mutex);
-        it = g_rpc_server_info.active_commands.insert(g_rpc_server_info.active_commands.cend(), {method, GetTimeMicros()});
+        it = g_rpc_server_info.active_commands.insert(g_rpc_server_info.active_commands.end(), {method, GetTimeMicros()});

@MarcoFalke MarcoFalke force-pushed the Mf1901-rpcCompileGCC48 branch from fa27cdd to fa5f890 Jan 27, 2019
@gmaxwell
Copy link
Contributor

@gmaxwell gmaxwell commented Jan 28, 2019

tested ACK

@MarcoFalke MarcoFalke merged commit fa5f890 into bitcoin:master Jan 28, 2019
2 checks passed
MarcoFalke added a commit that referenced this issue Jan 28, 2019
fa5f890 rpc: Compile on GCC4.8 (MarcoFalke)

Pull request description:

  GCC 4.8 is lacking some C++11 signatures (see "Adjust C++11 signatures to take a const_iterator." in GCC 4.9: gcc-mirror/gcc@3d2b2f4)

  Fix that by changing the code to use the pre-GCC 4.9 signature.

  Can be reverted after #13356.

  Fixes #15172 (reports on `Linux Mint 17.3 Rosa` and `CentOS Linux release 7.5.1804 (Core)`)

Tree-SHA512: 0c0b18968270ad4fcd0c2000c57485be881a461135dac3ad0bdab22c1a2292cf6b28ebeb930ccaa0290ff20ce87547fd07ab8189c4c4fb54d652a3d0bc9615f8
@MarcoFalke MarcoFalke deleted the Mf1901-rpcCompileGCC48 branch Jan 28, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants