Skip to content

c++11: add scoped enum fallbacks to CPPFLAGS rather than defining them locally#7322

Merged
laanwj merged 1 commit intobitcoin:masterfrom
theuni:c++11-prep
Jan 16, 2016
Merged

c++11: add scoped enum fallbacks to CPPFLAGS rather than defining them locally#7322
laanwj merged 1 commit intobitcoin:masterfrom
theuni:c++11-prep

Conversation

@theuni
Copy link
Member

@theuni theuni commented Jan 8, 2016

Sorry for the noise, #7302 didn't always work. Thanks to @luke-jr for working out the issue.

Due to include ordering, defining in one place was not enough to ensure correct usage. Use global defines so that we don't have to worry abou this ordering.

Also add a comment in configure about the test.

@luke-jr can you please verify that this now works for you?

@theuni
c++11: add scoped enum fallbacks to CPPFLAGS rather than defining the…
c0cf48d 
…m locally

Due to include ordering, defining in one place was not enough to ensure correct
usage. Use global defines so that we don't have to worry abou this ordering.

Also add a comment in configure about the test.
@laanwj
Copy link
Member

laanwj commented Jan 9, 2016

utACK

@laanwj
Copy link
Member

laanwj commented Jan 13, 2016

@luke-jr can you test this please?

@luke-jr
Copy link
Member

luke-jr commented Jan 14, 2016

ACK c0cf48d

Merged on top of c079d79, I got:

$ gcc --version
gcc (Gentoo 4.8.5 p1.3, pie-0.6.2) 4.8.5
Copyright (C) 2015 Free Software Foundation, Inc.
This is free software; see the source for copying conditions.  There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
$ src/test/test_bitcoin          
Running 181 test cases...

*** No errors detected
$ src/qt/test/test_bitcoin-qt
********* Start testing of URITests *********
Config: Using QTest library 4.8.6, Qt 4.8.6
PASS   : URITests::initTestCase()
PASS   : URITests::uriTests()
PASS   : URITests::cleanupTestCase()
Totals: 3 passed, 0 failed, 0 skipped
********* Finished testing of URITests *********
********* Start testing of PaymentServerTests *********
Config: Using QTest library 4.8.6, Qt 4.8.6
PASS   : PaymentServerTests::initTestCase()
QDEBUG : PaymentServerTests::paymentServerTests() PaymentServer::initNetManager: No active proxy server found. 
QDEBUG : PaymentServerTests::paymentServerTests() PaymentServer::processPaymentRequest: Secure payment request from  "testmerchant.org" 
QWARN  : PaymentServerTests::paymentServerTests() PaymentRequestPlus::getMerchant: Payment request: certificate expired or not yet active:  QSslCertificate( "3" , "3" , "LxHILx+N3qwVoAcCmQ5cyw==" , "" , "Expired Test Merchant" , QMap() , QDateTime("Sat Feb 23 21:26:43 2013") , QDateTime("Sun Feb 24 21:26:43 2013") ) 
QDEBUG : PaymentServerTests::paymentServerTests() PaymentServer::processPaymentRequest: Insecure payment request to  "1EcqLEpyu3zY7T5QU7RLrHEQH134KeGPXR" 
QWARN  : PaymentServerTests::paymentServerTests() PaymentRequestPlus::getMerchant: Payment request: certificate expired or not yet active:  QSslCertificate( "3" , "3" , "LxHILx+N3qwVoAcCmQ5cyw==" , "" , "Expired Test Merchant" , QMap() , QDateTime("Sat Feb 23 21:26:43 2013") , QDateTime("Sun Feb 24 21:26:43 2013") ) 
QDEBUG : PaymentServerTests::paymentServerTests() PaymentServer::processPaymentRequest: Secure payment request from  "testmerchant8.org" 
QWARN  : PaymentServerTests::paymentServerTests() PaymentRequestPlus::getMerchant: Payment request: certificate expired or not yet active:  QSslCertificate( "3" , "6" , "MiZaQ+g9lSHZGuHWkXZG+g==" , "" , "Payment Request Intermediate 5" , QMap() , QDateTime("Sat Feb 23 22:59:51 2013") , QDateTime("Sun Feb 24 22:59:51 2013") ) 
QDEBUG : PaymentServerTests::paymentServerTests() PaymentServer::processPaymentRequest: Insecure payment request to  "1EcqLEpyu3zY7T5QU7RLrHEQH134KeGPXR" 
QWARN  : PaymentServerTests::paymentServerTests() PaymentRequestPlus::getMerchant: Payment request: certificate expired or not yet active:  QSslCertificate( "3" , "6" , "MiZaQ+g9lSHZGuHWkXZG+g==" , "" , "Payment Request Intermediate 5" , QMap() , QDateTime("Sat Feb 23 22:59:51 2013") , QDateTime("Sun Feb 24 22:59:51 2013") ) 
QWARN  : PaymentServerTests::paymentServerTests() PaymentRequestPlus::getMerchant: SSL error:  certificate signature failure 
QDEBUG : PaymentServerTests::paymentServerTests() PaymentServer::processPaymentRequest: Insecure payment request to  "1EcqLEpyu3zY7T5QU7RLrHEQH134KeGPXR" 
QWARN  : PaymentServerTests::paymentServerTests() PaymentRequestPlus::getMerchant: SSL error:  certificate signature failure 
QWARN  : PaymentServerTests::paymentServerTests() PaymentRequestPlus::getMerchant: SSL error:  unable to get local issuer certificate 
QDEBUG : PaymentServerTests::paymentServerTests() PaymentServer::processPaymentRequest: Insecure payment request to  "1EcqLEpyu3zY7T5QU7RLrHEQH134KeGPXR" 
QWARN  : PaymentServerTests::paymentServerTests() PaymentRequestPlus::getMerchant: SSL error:  unable to get local issuer certificate 
QWARN  : PaymentServerTests::paymentServerTests() "PaymentServer::verifyNetwork: Payment request network "test" doesn't match client network "main"." 
QWARN  : PaymentServerTests::paymentServerTests() "PaymentServer::verifyExpired: Payment request expired "1970-01-01 00:00:01"." 
QWARN  : PaymentServerTests::paymentServerTests() "PaymentServer::verifyExpired: Payment request expired "1970-01-01 00:00:00"." 
QWARN  : PaymentServerTests::paymentServerTests() "PaymentServer::verifySize: Payment request too large (50001 bytes, allowed 50000 bytes)." 
QWARN  : PaymentServerTests::paymentServerTests() "PaymentServer::verifyAmount: Payment request amount out of allowed range (2100000100000000, allowed 0 - 2100000000000000)." 
PASS   : PaymentServerTests::paymentServerTests()
PASS   : PaymentServerTests::cleanupTestCase()
Totals: 3 passed, 0 failed, 0 skipped
********* Finished testing of PaymentServerTests *********

rpc-tests.py -extended also pass fine.

Additionally, I confirmed that Bitcoin-Qt starts on testnet, successfully reindexes its blockchain, connects to peers, sends a transaction, receives that transaction, and it is successfully mined by another peer.

@theuni
Copy link
Member Author

theuni commented Jan 14, 2016

@luke-jr Thanks for testing!

@paveljanik
Copy link
Contributor

paveljanik commented Jan 15, 2016

ACK

Compiled and tested with gcc (SUSE Linux) 4.8.3 20140627 [gcc-4_8-branch revision 212064].

@laanwj
Copy link
Member

laanwj commented Jan 16, 2016

@luke-jr Good to know, thanks for testing.

@laanwj laanwj merged commit c0cf48d into bitcoin:master Jan 16, 2016
laanwj added a commit that referenced this pull request Jan 16, 2016
@laanwj
Merge pull request #7322
fd9356b 
c0cf48d c++11: add scoped enum fallbacks to CPPFLAGS rather than defining them locally (Cory Fields)
sickpig referenced this pull request in sickpig/BitcoinUnlimited Mar 5, 2017
@laanwj @sickpig
Merge pull request #7322
bf020d1 
c0cf48d c++11: add scoped enum fallbacks to CPPFLAGS rather than defining them locally (Cory Fields)
@sickpig sickpig mentioned this pull request Mar 7, 2017
Merged
sickpig referenced this pull request in sickpig/BitcoinUnlimited Mar 31, 2017
@laanwj @sickpig
Merge pull request #7322
e340d4e 
c0cf48d c++11: add scoped enum fallbacks to CPPFLAGS rather than defining them locally (Cory Fields)
@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

Build system

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@theuni @laanwj @luke-jr @paveljanik