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

My FC work #12

Open
wants to merge 715 commits into
base: master
Choose a base branch
from
Open

My FC work #12

wants to merge 715 commits into from

Conversation

nathanielhourt
Copy link
Contributor

This is the latest of my FC work, including my merges from BitShares FC and some new work I've done on top to support my ongoing development.

abitmore and others added 25 commits July 2, 2020 09:18
Issue-13-fix (websocket shutdown)

See merge request PBSA/PeerplaysIO/tools-libs/peerplays-fc!17
ws-updates

See merge request PBSA/PeerplaysIO/tools-libs/peerplays-fc!18
This file was originally added in ff09920
For some reason, the websocket_server types have been altered to require
an X-Forwarded-For header (???) which seems utterly unnecessary. AFAICT,
it's safe to just leave it empty (BitShares does), so add a default arg
to make it do so by default.
This reverts commit 1dcacba.
Feature/readline-editline

See merge request PBSA/PeerplaysIO/tools-libs/peerplays-fc!20
static variant update

See merge request PBSA/PeerplaysIO/tools-libs/peerplays-fc!19
This is just a rote copy of vendor/websocketpp from two commits
ago, ie 0e92594
Remove as much warnings from build log as possible
Also, fix build:
Clang 10.0.1 has incompatible rules with other compilers on whether
you must/cannot put the `template` keyword in part of the reflection
code. Add a special case to make it work all around.
@bobinson
Copy link
Contributor

@nathanhourt - can you send the same to gitlab so that the CI gets kicked in ? We need to merge this as there is more sidechain work just started and want to use this FC changes. Just send the MR in gitlab and I guess we will find a way to quickly merge it

nathanielhourt and others added 4 commits September 21, 2021 12:36
It broke again so poke it again. Perhaps all clang versions require `template` here? I'm not sure, haven't gotten around to testing all the different compilers on it yet.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet