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.

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

Bug/1689 microprofile build #1690

Merged
merged 2 commits into from
Oct 10, 2023
Merged

Bug/1689 microprofile build #1690

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fed1457
1689 fix microprofile option
olehnikolaiev Oct 10, 2023
c420ff1
Merge branch 'v3.18.0' into bug/1689-microprofile-build
olehnikolaiev Oct 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions libdevcore/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,9 @@ add_library(devcore ${sources} ${headers})
add_dependencies(devcore secp256k1)

target_compile_options( devcore PRIVATE
-Wno-error=deprecated-copy -Wno-error=unused-result -Wno-error=unused-parameter -Wno-error=unused-variable -Wno-error=maybe-uninitialized
)
-Wno-error=deprecated-copy -Wno-error=unused-result -Wno-error=unused-parameter
-Wno-error=unused-variable -Wno-error=maybe-uninitialized -Wno-error=class-memaccess
)

# Needed to prevent including system-level boost headers:
target_include_directories(devcore SYSTEM PUBLIC ${Boost_INCLUDE_DIR} PRIVATE ../utils)
Expand Down
2 changes: 1 addition & 1 deletion skaled/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -550,6 +550,7 @@ int main( int argc, char** argv ) try {
cc::_on_ = false;
cc::_max_value_size_ = 2048;
MicroProfileSetEnableAllGroups( true );
dev::setThreadName( "main" );
BlockHeader::useTimestampHack = false;
srand( time( nullptr ) );
setCLocale();
Expand Down Expand Up @@ -2773,7 +2774,6 @@ int main( int argc, char** argv ) try {
<< cc::debug( "Done, programmatic shutdown via Web3 is disabled" );
}

dev::setThreadName( "main" );
if ( g_client ) {
unsigned int n = g_client->blockChain().details().number;
unsigned int mining = 0;
Expand Down
Loading