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

pull theuni wants to merge 1 commits into bitcoin:master from theuni:c++11-prep changing 2 files +12 −6
  1. theuni commented at 6:36 PM on January 8, 2016: member

    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?

  2. c++11: add scoped enum fallbacks to CPPFLAGS rather than defining them 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.
    c0cf48d1ac
  3. laanwj added the label Build system on Jan 9, 2016
  4. laanwj commented at 3:41 PM on January 9, 2016: member

    utACK

  5. laanwj commented at 10:09 AM on January 13, 2016: member

    @luke-jr can you test this please?

  6. luke-jr commented at 6:05 PM on January 14, 2016: member

    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.

  7. theuni commented at 8:46 PM on January 14, 2016: member

    @luke-jr Thanks for testing!

  8. paveljanik commented at 10:16 PM on January 15, 2016: contributor

    ACK

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

  9. laanwj commented at 9:50 AM on January 16, 2016: member

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

  10. laanwj merged this on Jan 16, 2016
  11. laanwj closed this on Jan 16, 2016

  12. laanwj referenced this in commit fd9356ba4e on Jan 16, 2016
  13. sickpig referenced this in commit bf020d1387 on Mar 5, 2017
  14. sickpig referenced this in commit e340d4eeac on Mar 31, 2017
  15. MarcoFalke locked this on Sep 8, 2021

github-metadata-mirror

This is a metadata mirror of the GitHub repository bitcoin/bitcoin. This site is not affiliated with GitHub. Content is generated from a GitHub metadata backup.
generated: 2026-04-18 15:15 UTC

This site is hosted by @0xB10C
More mirrored repositories can be found on mirror.b10c.me