From c2a37a83bd3f6047440e0d236a5b35ea78acb583 Mon Sep 17 00:00:00 2001 From: Anton Autushka Date: Thu, 9 Nov 2017 15:18:58 +0300 Subject: [PATCH 001/513] Boost 1.61 compatibility fix --- src/thread/context.hpp | 16 +++++- src/thread/thread_d.hpp | 22 +++++++- tests/CMakeLists.txt | 1 + tests/thread/thread_tests.cpp | 95 +++++++++++++++++++++++++++++++++++ 4 files changed, 130 insertions(+), 4 deletions(-) create mode 100644 tests/thread/thread_tests.cpp diff --git a/src/thread/context.hpp b/src/thread/context.hpp index f6e8a77..221df76 100644 --- a/src/thread/context.hpp +++ b/src/thread/context.hpp @@ -6,7 +6,14 @@ #include -#if BOOST_VERSION >= 105400 +#define BOOST_COROUTINES_NO_DEPRECATION_WARNING + +#if BOOST_VERSION >= 106100 + #include + namespace bc = boost::context::detail; + namespace bco = boost::coroutines; + typedef bco::stack_allocator stack_allocator; +#elif BOOST_VERSION >= 105400 # include namespace bc = boost::context; namespace bco = boost::coroutines; @@ -47,8 +54,13 @@ namespace fc { bco::stack_context stack_ctx; #endif +#if BOOST_VERSION >= 106100 + using context_fn = void (*)(bc::transfer_t); +#else + using context_fn = void(*)(intptr_t); +#endif - context( void (*sf)(intptr_t), stack_allocator& alloc, fc::thread* t ) + context( context_fn sf, stack_allocator& alloc, fc::thread* t ) : caller_context(0), stack_alloc(&alloc), next_blocked(0), diff --git a/src/thread/thread_d.hpp b/src/thread/thread_d.hpp index 941b2fa..6ad9421 100644 --- a/src/thread/thread_d.hpp +++ b/src/thread/thread_d.hpp @@ -18,6 +18,8 @@ namespace fc { class thread_d { public: + using context_pair = std::pair; + thread_d(fc::thread& s) :self(s), boost_thread(0), task_in_queue(0), @@ -397,7 +399,11 @@ namespace fc { } // slog( "jump to %p from %p", next, prev ); // fc_dlog( logger::get("fc_context"), "from ${from} to ${to}", ( "from", int64_t(prev) )( "to", int64_t(next) ) ); -#if BOOST_VERSION >= 105600 +#if BOOST_VERSION >= 106100 + auto p = context_pair{nullptr, prev}; + auto t = bc::jump_fcontext( next->my_context, &p ); + static_cast(t.data)->second->my_context = t.fctx; +#elif BOOST_VERSION >= 105600 bc::jump_fcontext( &prev->my_context, next->my_context, 0 ); #elif BOOST_VERSION >= 105300 bc::jump_fcontext( prev->my_context, next->my_context, 0 ); @@ -439,7 +445,11 @@ namespace fc { // slog( "jump to %p from %p", next, prev ); // fc_dlog( logger::get("fc_context"), "from ${from} to ${to}", ( "from", int64_t(prev) )( "to", int64_t(next) ) ); -#if BOOST_VERSION >= 105600 +#if BOOST_VERSION >= 106100 + auto p = context_pair{this, prev}; + auto t = bc::jump_fcontext( next->my_context, &p ); + static_cast(t.data)->second->my_context = t.fctx; +#elif BOOST_VERSION >= 105600 bc::jump_fcontext( &prev->my_context, next->my_context, (intptr_t)this ); #elif BOOST_VERSION >= 105300 bc::jump_fcontext( prev->my_context, next->my_context, (intptr_t)this ); @@ -467,9 +477,17 @@ namespace fc { return true; } +#if BOOST_VERSION >= 106100 + static void start_process_tasks( bc::transfer_t my ) + { + auto p = static_cast(my.data); + auto self = static_cast(p->first); + p->second->my_context = my.fctx; +#else static void start_process_tasks( intptr_t my ) { thread_d* self = (thread_d*)my; +#endif try { self->process_tasks(); diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 1043e50..f5d5a24 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -51,6 +51,7 @@ add_executable( all_tests all_tests.cpp crypto/sha_tests.cpp network/http/websocket_test.cpp thread/task_cancel.cpp + thread/thread_tests.cpp bloom_test.cpp real128_test.cpp utf8_test.cpp diff --git a/tests/thread/thread_tests.cpp b/tests/thread/thread_tests.cpp new file mode 100644 index 0000000..a1f3d1b --- /dev/null +++ b/tests/thread/thread_tests.cpp @@ -0,0 +1,95 @@ + +#include + +#include + +using namespace fc; + +BOOST_AUTO_TEST_SUITE(thread_tests) + +BOOST_AUTO_TEST_CASE(executes_task) +{ + bool called = false; + fc::thread thread("my"); + thread.async([&called]{called = true;}).wait(); + BOOST_CHECK(called); +} + +BOOST_AUTO_TEST_CASE(returns_value_from_function) +{ + fc::thread thread("my"); + BOOST_CHECK_EQUAL(10, thread.async([]{return 10;}).wait()); +} + +BOOST_AUTO_TEST_CASE(executes_multiple_tasks) +{ + bool called1 = false; + bool called2 = false; + + fc::thread thread("my"); + auto future1 = thread.async([&called1]{called1 = true;}); + auto future2 = thread.async([&called2]{called2 = true;}); + + future2.wait(); + future1.wait(); + + BOOST_CHECK(called1); + BOOST_CHECK(called2); +} + +BOOST_AUTO_TEST_CASE(calls_tasks_in_order) +{ + std::string result; + + fc::thread thread("my"); + auto future1 = thread.async([&result]{result += "hello ";}); + auto future2 = thread.async([&result]{result += "world";}); + + future2.wait(); + future1.wait(); + + BOOST_CHECK_EQUAL("hello world", result); +} + +BOOST_AUTO_TEST_CASE(yields_execution) +{ + std::string result; + + fc::thread thread("my"); + auto future1 = thread.async([&result]{fc::yield(); result += "world";}); + auto future2 = thread.async([&result]{result += "hello ";}); + + future2.wait(); + future1.wait(); + + BOOST_CHECK_EQUAL("hello world", result); +} + +BOOST_AUTO_TEST_CASE(quits_infinite_loop) +{ + fc::thread thread("my"); + auto f = thread.async([]{while (true) fc::yield();}); + + thread.quit(); + BOOST_CHECK_THROW(f.wait(), fc::canceled_exception); +} + +BOOST_AUTO_TEST_CASE(reschedules_yielded_task) +{ + int reschedule_count = 0; + + fc::thread thread("my"); + auto future = thread.async([&reschedule_count] + { + while (reschedule_count < 10) + { + fc::yield(); + reschedule_count++; + } + }); + + future.wait(); + BOOST_CHECK_EQUAL(10, reschedule_count); +} + +BOOST_AUTO_TEST_SUITE_END() From 20836338d2cfb79620b5254c587a806d5e4469e8 Mon Sep 17 00:00:00 2001 From: Anton Autushka Date: Thu, 9 Nov 2017 15:41:44 +0300 Subject: [PATCH 002/513] Suppress coroutines deprecation warning in boost 1.62 --- src/thread/context.hpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/thread/context.hpp b/src/thread/context.hpp index 221df76..18a060c 100644 --- a/src/thread/context.hpp +++ b/src/thread/context.hpp @@ -6,7 +6,8 @@ #include -#define BOOST_COROUTINES_NO_DEPRECATION_WARNING +#define BOOST_COROUTINES_NO_DEPRECATION_WARNING // Boost 1.61 +#define BOOST_COROUTINE_NO_DEPRECATION_WARNING // Boost 1.62 #if BOOST_VERSION >= 106100 #include From e754b4940e2142553029c693dc62318139a3824a Mon Sep 17 00:00:00 2001 From: cwyyprog Date: Tue, 14 Nov 2017 17:09:08 +0800 Subject: [PATCH 003/513] Update static_variant.hpp --- include/fc/static_variant.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/fc/static_variant.hpp b/include/fc/static_variant.hpp index 9aab790..d6206c2 100644 --- a/include/fc/static_variant.hpp +++ b/include/fc/static_variant.hpp @@ -382,5 +382,5 @@ struct visitor { s.visit( to_static_variant(ar[1]) ); } - template struct get_typename { static const char* name() { return typeid(static_variant).name(); } }; + template struct get_typename { static const char* name() { return typeid(static_variant).name(); } }; } // namespace fc From d157c2c756f1b65f7bb12af789c3ca1f9dcc647d Mon Sep 17 00:00:00 2001 From: cwyyprog Date: Tue, 14 Nov 2017 17:11:24 +0800 Subject: [PATCH 004/513] Update typename.hpp --- include/fc/reflect/typename.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/fc/reflect/typename.hpp b/include/fc/reflect/typename.hpp index 312c927..5cd55c9 100644 --- a/include/fc/reflect/typename.hpp +++ b/include/fc/reflect/typename.hpp @@ -15,7 +15,7 @@ namespace fc { class exception; namespace ip { class address; } - template class get_typename{}; + template struct get_typename; template<> struct get_typename { static const char* name() { return "int32_t"; } }; template<> struct get_typename { static const char* name() { return "int64_t"; } }; template<> struct get_typename { static const char* name() { return "int16_t"; } }; From dffe2a444e63be8afc771f89fac7083de32ef2b0 Mon Sep 17 00:00:00 2001 From: Abit Date: Sat, 20 Jan 2018 16:54:09 +0100 Subject: [PATCH 005/513] static_variant::set_which() rejects negative param --- include/fc/static_variant.hpp | 1 + 1 file changed, 1 insertion(+) diff --git a/include/fc/static_variant.hpp b/include/fc/static_variant.hpp index d6206c2..688d4b9 100644 --- a/include/fc/static_variant.hpp +++ b/include/fc/static_variant.hpp @@ -327,6 +327,7 @@ public: static int count() { return impl::type_info::count; } void set_which( int w ) { + FC_ASSERT( w >= 0 ); FC_ASSERT( w < count() ); this->~static_variant(); _tag = w; From c02fe0aaf68f899bd77c381c9f05d40d1a762d45 Mon Sep 17 00:00:00 2001 From: Peter Conrad Date: Tue, 23 Jan 2018 17:58:37 +0100 Subject: [PATCH 006/513] Added unit test to demonstrate problem with time_point_sec::to_iso_string --- tests/CMakeLists.txt | 1 + tests/time_test.cpp | 102 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 103 insertions(+) create mode 100644 tests/time_test.cpp diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index f5d5a24..bf7a01d 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -54,6 +54,7 @@ add_executable( all_tests all_tests.cpp thread/thread_tests.cpp bloom_test.cpp real128_test.cpp + time_test.cpp utf8_test.cpp ) target_link_libraries( all_tests fc ) diff --git a/tests/time_test.cpp b/tests/time_test.cpp new file mode 100644 index 0000000..58b7f90 --- /dev/null +++ b/tests/time_test.cpp @@ -0,0 +1,102 @@ +#include + +#include + +using namespace fc; + +BOOST_AUTO_TEST_SUITE(fc) + +BOOST_AUTO_TEST_CASE(time_point_sec_test) +{ + time_point_sec tp0(0); + BOOST_CHECK_EQUAL( "1970-01-01T00:00:00", tp0.to_iso_string() ); + BOOST_CHECK_EQUAL( "19700101T000000", tp0.to_non_delimited_iso_string() ); + + time_point_sec tp1(1); + BOOST_CHECK_EQUAL( "1970-01-01T00:00:01", tp1.to_iso_string() ); + BOOST_CHECK_EQUAL( "19700101T000001", tp1.to_non_delimited_iso_string() ); + + time_point_sec tp256(0x100); + BOOST_CHECK_EQUAL( "1970-01-01T00:04:16", tp256.to_iso_string() ); + BOOST_CHECK_EQUAL( "19700101T000416", tp256.to_non_delimited_iso_string() ); + + time_point_sec tp64k(0x10000); + BOOST_CHECK_EQUAL( "1970-01-01T18:12:16", tp64k.to_iso_string() ); + BOOST_CHECK_EQUAL( "19700101T181216", tp64k.to_non_delimited_iso_string() ); + + time_point_sec tp16m(0x1000000); + BOOST_CHECK_EQUAL( "1970-07-14T04:20:16", tp16m.to_iso_string() ); + BOOST_CHECK_EQUAL( "19700714T042016", tp16m.to_non_delimited_iso_string() ); + + time_point_sec tp2gm1(0x7fffffffU); + BOOST_CHECK_EQUAL( "2038-01-19T03:14:07", tp2gm1.to_iso_string() ); + BOOST_CHECK_EQUAL( "20380119T031407", tp2gm1.to_non_delimited_iso_string() ); + + time_point_sec tp2g(0x80000000U); + BOOST_CHECK_EQUAL( "2038-01-19T03:14:08", tp2g.to_iso_string() ); + BOOST_CHECK_EQUAL( "20380119T031408", tp2g.to_non_delimited_iso_string() ); + + time_point_sec tp3g(0xc0000000U); + BOOST_CHECK_EQUAL( "2072-01-28T16:51:12", tp3g.to_iso_string() ); + BOOST_CHECK_EQUAL( "20720128T165112", tp3g.to_non_delimited_iso_string() ); + + BOOST_CHECK( tp0 == time_point_sec() ); + BOOST_CHECK( tp0 < tp1 ); + BOOST_CHECK( tp0 < tp256 ); + BOOST_CHECK( tp0 < tp64k ); + BOOST_CHECK( tp0 < tp16m ); + BOOST_CHECK( tp0 < tp2gm1 ); + BOOST_CHECK( tp0 < tp2g ); + BOOST_CHECK( tp0 < tp3g ); + BOOST_CHECK( tp1 > tp0 ); + BOOST_CHECK( tp1 < tp256 ); + BOOST_CHECK( tp1 < tp64k ); + BOOST_CHECK( tp1 < tp16m ); + BOOST_CHECK( tp1 < tp2gm1 ); + BOOST_CHECK( tp1 < tp2g ); + BOOST_CHECK( tp1 < tp3g ); + BOOST_CHECK( tp256 > tp0 ); + BOOST_CHECK( tp256 > tp1 ); + BOOST_CHECK( tp256 < tp64k ); + BOOST_CHECK( tp256 < tp16m ); + BOOST_CHECK( tp256 < tp2gm1 ); + BOOST_CHECK( tp256 < tp2g ); + BOOST_CHECK( tp256 < tp3g ); + BOOST_CHECK( tp64k > tp0 ); + BOOST_CHECK( tp64k > tp1 ); + BOOST_CHECK( tp64k > tp256 ); + BOOST_CHECK( tp64k < tp16m ); + BOOST_CHECK( tp64k < tp2gm1 ); + BOOST_CHECK( tp64k < tp2g ); + BOOST_CHECK( tp64k < tp3g ); + BOOST_CHECK( tp16m > tp0 ); + BOOST_CHECK( tp16m > tp1 ); + BOOST_CHECK( tp16m > tp256 ); + BOOST_CHECK( tp16m > tp64k ); + BOOST_CHECK( tp16m < tp2gm1 ); + BOOST_CHECK( tp16m < tp2g ); + BOOST_CHECK( tp16m < tp3g ); + BOOST_CHECK( tp2gm1 > tp0 ); + BOOST_CHECK( tp2gm1 > tp1 ); + BOOST_CHECK( tp2gm1 > tp256 ); + BOOST_CHECK( tp2gm1 > tp64k ); + BOOST_CHECK( tp2gm1 > tp16m ); + BOOST_CHECK( tp2gm1 < tp2g ); + BOOST_CHECK( tp2gm1 < tp3g ); + BOOST_CHECK( tp2g > tp0 ); + BOOST_CHECK( tp2g > tp1 ); + BOOST_CHECK( tp2g > tp256 ); + BOOST_CHECK( tp2g > tp64k ); + BOOST_CHECK( tp2g > tp16m ); + BOOST_CHECK( tp2g > tp2gm1 ); + BOOST_CHECK( tp2g < tp3g ); + BOOST_CHECK( tp3g > tp0 ); + BOOST_CHECK( tp3g > tp1 ); + BOOST_CHECK( tp3g > tp256 ); + BOOST_CHECK( tp3g > tp64k ); + BOOST_CHECK( tp3g > tp2gm1 ); + BOOST_CHECK( tp3g > tp2g ); + BOOST_CHECK( tp3g > tp16m ); +} + +BOOST_AUTO_TEST_SUITE_END() From 5138c58e0905430f4bff39a774f6d04b2d0bc150 Mon Sep 17 00:00:00 2001 From: Alexey Frolov Date: Fri, 2 Feb 2018 15:29:46 +0300 Subject: [PATCH 007/513] sanitize, remove warnings --- include/fc/io/json_relaxed.hpp | 2 ++ include/fc/static_variant.hpp | 7 +++--- include/fc/thread/thread.hpp | 1 + src/asio.cpp | 8 +++++++ src/compress/miniz.c | 6 ++--- src/crypto/aes.cpp | 12 +++++----- src/crypto/base36.cpp | 5 +++- src/crypto/base58.cpp | 4 +++- src/crypto/elliptic_common.cpp | 8 +++---- src/crypto/elliptic_secp256k1.cpp | 5 ++-- src/crypto/rand.cpp | 4 ++-- src/rpc/cli.cpp | 6 ++--- src/thread/mutex.cpp | 2 +- src/thread/thread.cpp | 20 ++++++++++------ src/utf8.cpp | 1 - tests/bloom_test.cpp | 2 +- tests/crypto/base_n_tests.cpp | 13 ++++------ tests/crypto/blowfish_test.cpp | 34 +++++++++++++-------------- tests/crypto/rand_test.cpp | 4 +++- tests/crypto/sha_tests.cpp | 2 +- tests/hmac_test.cpp | 2 +- tests/network/http/websocket_test.cpp | 6 ++--- tests/real128_test.cpp | 10 ++++---- 23 files changed, 91 insertions(+), 73 deletions(-) diff --git a/include/fc/io/json_relaxed.hpp b/include/fc/io/json_relaxed.hpp index e4876f2..c1a0966 100644 --- a/include/fc/io/json_relaxed.hpp +++ b/include/fc/io/json_relaxed.hpp @@ -231,6 +231,8 @@ namespace fc { namespace json_relaxed } } FC_RETHROW_EXCEPTIONS( warn, "while parsing string" ); + + return {}; } struct CharValueTable diff --git a/include/fc/static_variant.hpp b/include/fc/static_variant.hpp index 688d4b9..4f13f5b 100644 --- a/include/fc/static_variant.hpp +++ b/include/fc/static_variant.hpp @@ -181,7 +181,7 @@ class static_variant { static_assert(impl::type_info::no_reference_types, "Reference types are not permitted in static_variant."); static_assert(impl::type_info::no_duplicates, "static_variant type arguments contain duplicate types."); - int _tag; + size_t _tag; char storage[impl::type_info::size]; template @@ -326,15 +326,14 @@ public: } static int count() { return impl::type_info::count; } - void set_which( int w ) { - FC_ASSERT( w >= 0 ); + void set_which( size_t w ) { FC_ASSERT( w < count() ); this->~static_variant(); _tag = w; impl::storage_ops<0, Types...>::con(_tag, storage); } - int which() const {return _tag;} + size_t which() const {return _tag;} }; template diff --git a/include/fc/thread/thread.hpp b/include/fc/thread/thread.hpp index bb82710..aea55da 100644 --- a/include/fc/thread/thread.hpp +++ b/include/fc/thread/thread.hpp @@ -32,6 +32,7 @@ namespace fc { an existing "unknown" boost thread). In such cases, thread_d doesn't have access boost::thread object. */ static thread& current(); + static void cleanup(); /** diff --git a/src/asio.cpp b/src/asio.cpp index 0169576..1313ed7 100644 --- a/src/asio.cpp +++ b/src/asio.cpp @@ -3,6 +3,7 @@ #include #include #include +#include namespace fc { namespace asio { @@ -104,6 +105,13 @@ namespace fc { asio_threads.push_back( new boost::thread( [=]() { fc::thread::current().set_name("asio"); + + BOOST_SCOPE_EXIT(void) + { + fc::thread::cleanup(); + } + BOOST_SCOPE_EXIT_END + while (!io->stopped()) { try diff --git a/src/compress/miniz.c b/src/compress/miniz.c index 7123d62..987614d 100644 --- a/src/compress/miniz.c +++ b/src/compress/miniz.c @@ -1497,7 +1497,7 @@ tinfl_status tinfl_decompress(tinfl_decompressor *r, const mz_uint8 *pIn_buf_nex { mz_uint8 *p = r->m_tables[0].m_code_size; mz_uint i; r->m_table_sizes[0] = 288; r->m_table_sizes[1] = 32; TINFL_MEMSET(r->m_tables[1].m_code_size, 5, 32); - for ( i = 0; i <= 143; ++i) *p++ = 8; for ( ; i <= 255; ++i) *p++ = 9; for ( ; i <= 279; ++i) *p++ = 7; for ( ; i <= 287; ++i) *p++ = 8; + for (i = 0; i <= 143; ++i) {*p++ = 8;} for (; i <= 255; ++i) {*p++ = 9;} for (; i <= 279; ++i) {*p++ = 7;} for (; i <= 287; ++i) {*p++ = 8;} } else { @@ -2281,7 +2281,7 @@ static MZ_FORCEINLINE void tdefl_find_match(tdefl_compressor *d, mz_uint lookahe if (TDEFL_READ_UNALIGNED_WORD(&d->m_dict[probe_pos + match_len - 1]) == c01) break; TDEFL_PROBE; TDEFL_PROBE; TDEFL_PROBE; } - if (!dist) break; q = (const mz_uint16*)(d->m_dict + probe_pos); if (TDEFL_READ_UNALIGNED_WORD(q) != s01) continue; p = s; probe_len = 32; + if (!dist) {break;} q = (const mz_uint16*)(d->m_dict + probe_pos); if (TDEFL_READ_UNALIGNED_WORD(q) != s01) {continue;} p = s; probe_len = 32; do { } while ( (TDEFL_READ_UNALIGNED_WORD(++p) == TDEFL_READ_UNALIGNED_WORD(++q)) && (TDEFL_READ_UNALIGNED_WORD(++p) == TDEFL_READ_UNALIGNED_WORD(++q)) && (TDEFL_READ_UNALIGNED_WORD(++p) == TDEFL_READ_UNALIGNED_WORD(++q)) && (TDEFL_READ_UNALIGNED_WORD(++p) == TDEFL_READ_UNALIGNED_WORD(++q)) && (--probe_len > 0) ); if (!probe_len) @@ -2848,7 +2848,7 @@ void *tdefl_write_image_to_png_file_in_memory(const void *pImage, int w, int h, #include #include - #if defined(_MSC_VER) + #if defined(_MSC_VER) static FILE *mz_fopen(const char *pFilename, const char *pMode) { FILE* pFile = NULL; diff --git a/src/crypto/aes.cpp b/src/crypto/aes.cpp index 7564816..09db92b 100644 --- a/src/crypto/aes.cpp +++ b/src/crypto/aes.cpp @@ -29,7 +29,7 @@ struct aes_encoder::impl aes_encoder::aes_encoder() { - static int init = init_openssl(); + static __attribute__((unused)) int init = init_openssl(); } aes_encoder::~aes_encoder() @@ -70,7 +70,7 @@ uint32_t aes_encoder::encode( const char* plaintxt, uint32_t plaintext_len, char FC_THROW_EXCEPTION( aes_exception, "error during aes 256 cbc encryption update", ("s", ERR_error_string( ERR_get_error(), nullptr) ) ); } - FC_ASSERT( ciphertext_len == plaintext_len, "", ("ciphertext_len",ciphertext_len)("plaintext_len",plaintext_len) ); + FC_ASSERT( (uint32_t) ciphertext_len == plaintext_len, "", ("ciphertext_len",ciphertext_len)("plaintext_len",plaintext_len) ); return ciphertext_len; } #if 0 @@ -96,9 +96,9 @@ struct aes_decoder::impl }; aes_decoder::aes_decoder() - { - static int init = init_openssl(); - } +{ + static __attribute__((unused)) int init = init_openssl(); +} void aes_decoder::init( const fc::sha256& key, const fc::uint128& init_value ) { @@ -137,7 +137,7 @@ uint32_t aes_decoder::decode( const char* ciphertxt, uint32_t ciphertxt_len, cha FC_THROW_EXCEPTION( aes_exception, "error during aes 256 cbc decryption update", ("s", ERR_error_string( ERR_get_error(), nullptr) ) ); } - FC_ASSERT( ciphertxt_len == plaintext_len, "", ("ciphertxt_len",ciphertxt_len)("plaintext_len",plaintext_len) ); + FC_ASSERT( ciphertxt_len == (uint32_t)plaintext_len, "", ("ciphertxt_len",ciphertxt_len)("plaintext_len",plaintext_len) ); return plaintext_len; } #if 0 diff --git a/src/crypto/base36.cpp b/src/crypto/base36.cpp index d0685ae..5e3bd5b 100644 --- a/src/crypto/base36.cpp +++ b/src/crypto/base36.cpp @@ -76,7 +76,10 @@ namespace fc while (len > 0 && *first == 0) { first++; len--; } std::vector result; result.resize(leading_zeros + len, 0); - memcpy( result.data() + leading_zeros, first, len ); + if (len) + { + memcpy( result.data() + leading_zeros, first, len ); + } return result; } } diff --git a/src/crypto/base58.cpp b/src/crypto/base58.cpp index e1d5d33..4551678 100644 --- a/src/crypto/base58.cpp +++ b/src/crypto/base58.cpp @@ -632,7 +632,9 @@ size_t from_base58( const std::string& base58_str, char* out_data, size_t out_da FC_THROW_EXCEPTION( parse_error_exception, "Unable to decode base58 string ${base58_str}", ("base58_str",base58_str) ); } FC_ASSERT( out.size() <= out_data_len ); - memcpy( out_data, out.data(), out.size() ); + if (!out.empty()) { + memcpy( out_data, out.data(), out.size() ); + } return out.size(); } } diff --git a/src/crypto/elliptic_common.cpp b/src/crypto/elliptic_common.cpp index 66b75d0..9b9044c 100644 --- a/src/crypto/elliptic_common.cpp +++ b/src/crypto/elliptic_common.cpp @@ -85,8 +85,8 @@ namespace fc { namespace ecc { ssl_bignum order; FC_ASSERT( EC_GROUP_get_order( group, order, ctx ) ); private_key_secret bin; - FC_ASSERT( BN_num_bytes( order ) == bin.data_size() ); - FC_ASSERT( BN_bn2bin( order, (unsigned char*) bin.data() ) == bin.data_size() ); + FC_ASSERT( (size_t) BN_num_bytes( order ) == bin.data_size() ); + FC_ASSERT( (size_t) BN_bn2bin( order, (unsigned char*) bin.data() ) == bin.data_size() ); return bin; } @@ -104,8 +104,8 @@ namespace fc { namespace ecc { FC_ASSERT( EC_GROUP_get_order( group, order, ctx ) ); BN_rshift1( order, order ); private_key_secret bin; - FC_ASSERT( BN_num_bytes( order ) == bin.data_size() ); - FC_ASSERT( BN_bn2bin( order, (unsigned char*) bin.data() ) == bin.data_size() ); + FC_ASSERT( (size_t) BN_num_bytes( order ) == bin.data_size() ); + FC_ASSERT( (size_t) BN_bn2bin( order, (unsigned char*) bin.data() ) == bin.data_size() ); return bin; } diff --git a/src/crypto/elliptic_secp256k1.cpp b/src/crypto/elliptic_secp256k1.cpp index 91edc18..469cc1b 100644 --- a/src/crypto/elliptic_secp256k1.cpp +++ b/src/crypto/elliptic_secp256k1.cpp @@ -29,9 +29,8 @@ namespace fc { namespace ecc { } void _init_lib() { - static const secp256k1_context_t* ctx = _get_context(); - static int init_o = init_openssl(); - (void)ctx; + static __attribute__((unused)) const secp256k1_context_t* ctx = _get_context(); + static __attribute__((unused)) int init_o = init_openssl(); } class public_key_impl diff --git a/src/crypto/rand.cpp b/src/crypto/rand.cpp index 7235ab6..2b194c5 100644 --- a/src/crypto/rand.cpp +++ b/src/crypto/rand.cpp @@ -8,7 +8,7 @@ namespace fc { void rand_bytes(char* buf, int count) { - static int init = init_openssl(); + static __attribute__((unused)) int init = init_openssl(); int result = RAND_bytes((unsigned char*)buf, count); if (result != 1) @@ -17,7 +17,7 @@ void rand_bytes(char* buf, int count) void rand_pseudo_bytes(char* buf, int count) { - static int init = init_openssl(); + static __attribute__((unused)) int init = init_openssl(); int result = RAND_pseudo_bytes((unsigned char*)buf, count); if (result == -1) diff --git a/src/rpc/cli.cpp b/src/rpc/cli.cpp index d3070fb..e59d4bb 100644 --- a/src/rpc/cli.cpp +++ b/src/rpc/cli.cpp @@ -136,7 +136,7 @@ char * dupstr (const char* s) { char* my_generator(const char* text, int state) { - static int list_index, len; + static size_t list_index, len; const char *name; if (!state) { @@ -160,20 +160,20 @@ char* my_generator(const char* text, int state) } +#ifdef HAVE_READLINE static char** cli_completion( const char * text , int start, int end) { char **matches; matches = (char **)NULL; -#ifdef HAVE_READLINE if (start == 0) matches = rl_completion_matches ((char*)text, &my_generator); else rl_bind_key('\t',rl_abort); -#endif return (matches); } +#endif void cli::getline( const fc::string& prompt, fc::string& line) diff --git a/src/thread/mutex.cpp b/src/thread/mutex.cpp index 9f3f9ba..2a87564 100644 --- a/src/thread/mutex.cpp +++ b/src/thread/mutex.cpp @@ -15,7 +15,7 @@ namespace fc { mutex::~mutex() { if( m_blist ) { - context* c = m_blist; +// context* c = m_blist; fc::thread::current().debug("~mutex"); #if 0 while( c ) { diff --git a/src/thread/thread.cpp b/src/thread/thread.cpp index 7b899bb..7ca01f2 100644 --- a/src/thread/thread.cpp +++ b/src/thread/thread.cpp @@ -113,8 +113,10 @@ namespace fc { if( my ) { // wlog( "calling quit() on ${n}",("n",my->name) ); - quit(); // deletes `my` + quit(); } + + delete my; } thread& thread::current() { @@ -123,6 +125,11 @@ namespace fc { return *current_thread(); } + void thread::cleanup() { + delete current_thread(); + current_thread() = nullptr; + } + const string& thread::name()const { return my->name; @@ -152,19 +159,18 @@ namespace fc { { //if quitting from a different thread, start quit task on thread. //If we have and know our attached boost thread, wait for it to finish, then return. - if( ¤t() != this ) + if( !is_current() ) { + auto t = my->boost_thread; async( [=](){quit();}, "thread::quit" );//.wait(); - if( my->boost_thread ) + if( t ) { //wlog("destroying boost thread ${tid}",("tid",(uintptr_t)my->boost_thread->native_handle())); - my->boost_thread->join(); - delete my; - my = nullptr; + t->join(); } return; } - + my->done = true; // wlog( "${s}", ("s",name()) ); // We are quiting from our own thread... diff --git a/src/utf8.cpp b/src/utf8.cpp index 14551c4..d98cd87 100644 --- a/src/utf8.cpp +++ b/src/utf8.cpp @@ -13,7 +13,6 @@ namespace fc { bool is_utf8( const std::string& str ) { - auto itr = utf8::find_invalid(str.begin(), str.end()); return utf8::is_valid( str.begin(), str.end() ); } diff --git a/tests/bloom_test.cpp b/tests/bloom_test.cpp index ca17792..1ba7e0d 100644 --- a/tests/bloom_test.cpp +++ b/tests/bloom_test.cpp @@ -48,7 +48,7 @@ BOOST_AUTO_TEST_CASE(bloom_test_1) std::string line; std::ifstream in("README.md"); std::ofstream words("words.txt"); - while( !in.eof() && count < 100000 ) + while( in.good() && count < 100000 ) { std::getline(in, line); // std::cout << "'"< 10) { @@ -53,7 +53,7 @@ static void test_36( const std::string& test, const std::string& expected ) std::vector dec = fc::from_base36( enc1 ); BOOST_CHECK_EQUAL( vec.size(), dec.size() ); - BOOST_CHECK( !memcmp( vec.data(), dec.data(), vec.size() ) ); + BOOST_CHECK( vec == dec ); } BOOST_AUTO_TEST_CASE(base36_test) @@ -76,17 +76,14 @@ static void test_58( const std::string& test, const std::string& expected ) std::vector dec = fc::from_base58( enc1 ); BOOST_CHECK_EQUAL( vec.size(), dec.size() ); - BOOST_CHECK( !memcmp( vec.data(), dec.data(), vec.size() ) ); + BOOST_CHECK( vec == dec ); char buffer[64]; size_t len = fc::from_base58( enc1, buffer, 64 ); BOOST_CHECK( len <= 64 ); - BOOST_CHECK( !memcmp( vec.data(), buffer, len ) ); + BOOST_CHECK( vec.empty() || !memcmp( vec.data(), buffer, len ) ); if ( len > 10 ) { - try { - len = fc::from_base58( enc1, buffer, 10 ); - BOOST_CHECK( len <= 10 ); - } catch ( fc::exception expected ) {} + BOOST_CHECK_THROW(fc::from_base58( enc1, buffer, 10 ), fc::exception); } } diff --git a/tests/crypto/blowfish_test.cpp b/tests/crypto/blowfish_test.cpp index ec4ada7..ca55bca 100644 --- a/tests/crypto/blowfish_test.cpp +++ b/tests/crypto/blowfish_test.cpp @@ -75,9 +75,9 @@ const char key_test_ciphers[][17] = { const std::string chain_test_key = "0123456789ABCDEFF0E1D2C3B4A59687"; const std::string chain_test_iv = "FEDCBA9876543210"; -const std::string chain_test_plain = "7654321 Now is the time for \0\0\0\0"; const std::string chain_test_cbc = "6B77B4D63006DEE605B156E27403979358DEB9E7154616D959F1652BD5FF92CC"; const std::string chain_test_cfb = "E73214A2822139CAF26ECF6D2EB9E76E3DA3DE04D1517200519D57A6C3"; +const char* chain_test_plain = "7654321 Now is the time for \0\0\0\0"; BOOST_AUTO_TEST_SUITE(fc_crypto) @@ -85,9 +85,9 @@ BOOST_AUTO_TEST_CASE(blowfish_ecb_test) { for ( int i = 0; i < 34; i++ ) { unsigned char key[8], plain[8], cipher[8], out[8]; - BOOST_CHECK_EQUAL( 8, fc::from_hex( ecb_tests[i].key, (char*) key, sizeof(key) ) ); - BOOST_CHECK_EQUAL( 8, fc::from_hex( ecb_tests[i].plain, (char*) plain, sizeof(plain) ) ); - BOOST_CHECK_EQUAL( 8, fc::from_hex( ecb_tests[i].cipher, (char*) cipher, sizeof(cipher) ) ); + BOOST_CHECK_EQUAL( 8u, fc::from_hex( ecb_tests[i].key, (char*) key, sizeof(key) ) ); + BOOST_CHECK_EQUAL( 8u, fc::from_hex( ecb_tests[i].plain, (char*) plain, sizeof(plain) ) ); + BOOST_CHECK_EQUAL( 8u, fc::from_hex( ecb_tests[i].cipher, (char*) cipher, sizeof(cipher) ) ); fc::blowfish fish; fish.start( key, 8 ); @@ -105,11 +105,11 @@ BOOST_AUTO_TEST_CASE(blowfish_ecb_test) BOOST_AUTO_TEST_CASE(blowfish_key_test) { unsigned char key[24], plain[8], cipher[8], out[8]; - BOOST_CHECK_EQUAL( 24, fc::from_hex( key_test_key.c_str(), (char*) key, sizeof(key) ) ); - BOOST_CHECK_EQUAL( 8, fc::from_hex( key_test_plain.c_str(), (char*) plain, sizeof(plain) ) ); + BOOST_CHECK_EQUAL( 24u, fc::from_hex( key_test_key.c_str(), (char*) key, sizeof(key) ) ); + BOOST_CHECK_EQUAL( 8u, fc::from_hex( key_test_plain.c_str(), (char*) plain, sizeof(plain) ) ); for ( unsigned int i = 0; i < sizeof(key); i++ ) { - BOOST_CHECK_EQUAL( 8, fc::from_hex( key_test_ciphers[i], (char*) cipher, sizeof(cipher) ) ); + BOOST_CHECK_EQUAL( 8u, fc::from_hex( key_test_ciphers[i], (char*) cipher, sizeof(cipher) ) ); fc::blowfish fish; fish.start( key, i + 1 ); fish.encrypt( plain, out, 8, fc::blowfish::ECB ); @@ -133,37 +133,37 @@ static unsigned int from_bytes( const unsigned char* p ) { BOOST_AUTO_TEST_CASE(blowfish_chain_test) { unsigned char key[16], iv[8], cipher[32], out[32]; - BOOST_CHECK_EQUAL( 16, fc::from_hex( chain_test_key.c_str(), (char*) key, sizeof(key) ) ); - BOOST_CHECK_EQUAL( 8, fc::from_hex( chain_test_iv.c_str(), (char*) iv, sizeof(iv) ) ); + BOOST_CHECK_EQUAL( 16u, fc::from_hex( chain_test_key.c_str(), (char*) key, sizeof(key) ) ); + BOOST_CHECK_EQUAL( 8u, fc::from_hex( chain_test_iv.c_str(), (char*) iv, sizeof(iv) ) ); - BOOST_CHECK_EQUAL( 32, fc::from_hex( chain_test_cbc.c_str(), (char*) cipher, sizeof(cipher) ) ); + BOOST_CHECK_EQUAL( 32u, fc::from_hex( chain_test_cbc.c_str(), (char*) cipher, sizeof(cipher) ) ); fc::blowfish fish; fish.start( key, sizeof(key), fc::sblock( from_bytes( iv ), from_bytes( iv + 4 ) ) ); - fish.encrypt( (unsigned char*) chain_test_plain.c_str(), out, sizeof(out), fc::blowfish::CBC ); + fish.encrypt( (unsigned char*) chain_test_plain, out, sizeof(out), fc::blowfish::CBC ); BOOST_CHECK( !memcmp( cipher, out, sizeof(cipher) ) ); fish.reset_chain(); fish.decrypt( out, sizeof(out), fc::blowfish::CBC ); - BOOST_CHECK( !memcmp( chain_test_plain.c_str(), out, 29 ) ); + BOOST_CHECK( !memcmp( chain_test_plain, out, 29 ) ); fish.reset_chain(); fish.encrypt( out, sizeof(out), fc::blowfish::CBC ); BOOST_CHECK( !memcmp( cipher, out, sizeof(cipher) ) ); fish.reset_chain(); fish.decrypt( cipher, out, sizeof(cipher), fc::blowfish::CBC ); - BOOST_CHECK( !memcmp( chain_test_plain.c_str(), out, 29 ) ); + BOOST_CHECK( !memcmp( chain_test_plain, out, 29 ) ); - BOOST_CHECK_EQUAL( 29, fc::from_hex( chain_test_cfb.c_str(), (char*) cipher, sizeof(cipher) ) ); + BOOST_CHECK_EQUAL( 29u, fc::from_hex( chain_test_cfb.c_str(), (char*) cipher, sizeof(cipher) ) ); fish.reset_chain(); - fish.encrypt( (unsigned char*) chain_test_plain.c_str(), out, sizeof(out), fc::blowfish::CFB ); + fish.encrypt( (unsigned char*) chain_test_plain, out, sizeof(out), fc::blowfish::CFB ); BOOST_CHECK( !memcmp( cipher, out, 29 ) ); fish.reset_chain(); memset( out + 29, 0, 3 ); fish.decrypt( out, sizeof(out), fc::blowfish::CFB ); - BOOST_CHECK( !memcmp( chain_test_plain.c_str(), out, 29 ) ); + BOOST_CHECK( !memcmp( chain_test_plain, out, 29 ) ); fish.reset_chain(); memset( out + 29, 0, 3 ); fish.encrypt( out, sizeof(out), fc::blowfish::CFB ); BOOST_CHECK( !memcmp( cipher, out, 29 ) ); fish.reset_chain(); memset( out + 29, 0, 3 ); fish.decrypt( cipher, out, sizeof(cipher), fc::blowfish::CFB ); - BOOST_CHECK( !memcmp( chain_test_plain.c_str(), out, 29 ) ); + BOOST_CHECK( !memcmp( chain_test_plain, out, 29 ) ); } BOOST_AUTO_TEST_SUITE_END() diff --git a/tests/crypto/rand_test.cpp b/tests/crypto/rand_test.cpp index 09533be..6d6a26f 100644 --- a/tests/crypto/rand_test.cpp +++ b/tests/crypto/rand_test.cpp @@ -21,7 +21,9 @@ static void check_randomness( const char* buffer, size_t len ) { double E = 1 + (zc + oc) / 2.0; double variance = (E - 1) * (E - 2) / (oc + zc - 1); double sigma = sqrt(variance); - BOOST_CHECK( rc > E - sigma && rc < E + sigma); + + BOOST_CHECK_GT(rc, E - sigma); + BOOST_CHECK_LT(rc, E + sigma); } BOOST_AUTO_TEST_SUITE(fc_crypto) diff --git a/tests/crypto/sha_tests.cpp b/tests/crypto/sha_tests.cpp index 850c2f8..104f0c2 100644 --- a/tests/crypto/sha_tests.cpp +++ b/tests/crypto/sha_tests.cpp @@ -75,7 +75,7 @@ void test_big( const std::string& expected ) { template void test_stream( ) { - H hash( TEST1 ); + H hash = H::hash( TEST1 ); std::stringstream stream; stream << hash; diff --git a/tests/hmac_test.cpp b/tests/hmac_test.cpp index a8f21dd..140b211 100644 --- a/tests/hmac_test.cpp +++ b/tests/hmac_test.cpp @@ -72,7 +72,7 @@ static fc::hmac mac_224; static fc::hmac mac_256; static fc::hmac mac_512; -template +template static void run_test( const fc::string& key, const fc::string& data, const fc::string& expect_224, const fc::string& expect_256, const fc::string& expect_512 ) { diff --git a/tests/network/http/websocket_test.cpp b/tests/network/http/websocket_test.cpp index 03bfdd1..83fcba9 100644 --- a/tests/network/http/websocket_test.cpp +++ b/tests/network/http/websocket_test.cpp @@ -39,7 +39,7 @@ BOOST_AUTO_TEST_CASE(websocket_test) try { c_conn->send_message( "again" ); BOOST_FAIL("expected assertion failure"); - } catch (const fc::assert_exception& e) { + } catch (const fc::exception& e) { //std::cerr << e.to_string() << "\n"; } @@ -55,14 +55,14 @@ BOOST_AUTO_TEST_CASE(websocket_test) try { c_conn->send_message( "again" ); BOOST_FAIL("expected assertion failure"); - } catch (const fc::assert_exception& e) { + } catch (const fc::exception& e) { std::cerr << e.to_string() << "\n"; } try { c_conn = client.connect( "ws://localhost:8090" ); BOOST_FAIL("expected assertion failure"); - } catch (const fc::assert_exception& e) { + } catch (const fc::exception& e) { std::cerr << e.to_string() << "\n"; } } diff --git a/tests/real128_test.cpp b/tests/real128_test.cpp index beae9b7..5020af9 100644 --- a/tests/real128_test.cpp +++ b/tests/real128_test.cpp @@ -11,9 +11,9 @@ BOOST_AUTO_TEST_CASE(real128_test) { BOOST_CHECK_EQUAL(string(real128()), string("0.")); BOOST_CHECK_EQUAL(string(real128(0)), string("0.")); - BOOST_CHECK_EQUAL(real128(8).to_uint64(), 8); - BOOST_CHECK_EQUAL(real128(6789).to_uint64(), 6789); - BOOST_CHECK_EQUAL(real128(10000).to_uint64(), 10000); + BOOST_CHECK_EQUAL(real128(8).to_uint64(), 8u); + BOOST_CHECK_EQUAL(real128(6789).to_uint64(), 6789u); + BOOST_CHECK_EQUAL(real128(10000).to_uint64(), 10000u); BOOST_CHECK_EQUAL(string(real128(1)), string("1.")); BOOST_CHECK_EQUAL(string(real128(5)), string("5.")); BOOST_CHECK_EQUAL(string(real128(12345)), string("12345.")); @@ -41,8 +41,8 @@ BOOST_AUTO_TEST_CASE(real128_test) BOOST_CHECK_EQUAL( string(pi*1), "3.1415926535" ); BOOST_CHECK_EQUAL( string(pi*0), "0." ); - BOOST_CHECK_EQUAL(real128("12345.6789").to_uint64(), 12345); - BOOST_CHECK_EQUAL((real128("12345.6789")*10000).to_uint64(), 123456789); + BOOST_CHECK_EQUAL(real128("12345.6789").to_uint64(), 12345u); + BOOST_CHECK_EQUAL((real128("12345.6789")*10000).to_uint64(), 123456789u); BOOST_CHECK_EQUAL(string(real128("12345.6789")), string("12345.6789")); BOOST_CHECK_EQUAL( real128(uint64_t(-1)).to_uint64(), uint64_t(-1) ); From 1ae7f6bb0206497d2e6eb45845bcb6b1a0dadd37 Mon Sep 17 00:00:00 2001 From: Alexey Frolov Date: Mon, 5 Feb 2018 12:19:06 +0300 Subject: [PATCH 008/513] FIXES: - 'bloom_test_1': infinite loop if file not exists - 'websocket_test': uncatched exceptions - 'fc_crypto*' test_stream<>: uninitialized variable (hash) - 'blowfish_chain_test': using memory after allocated heap - memcmp: passing nullptr, when non-null expected - undefined behavior: return value from function - static_variant: member alignment - performance issue on 64-bit arch - memory leak: fc::thread cleanup in asio thread - warning: signed-unsigned comparison - warning: unused variables --- src/crypto/aes.cpp | 6 ++++-- src/crypto/elliptic_secp256k1.cpp | 6 ++++-- src/crypto/rand.cpp | 6 ++++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/crypto/aes.cpp b/src/crypto/aes.cpp index 09db92b..2dbae6c 100644 --- a/src/crypto/aes.cpp +++ b/src/crypto/aes.cpp @@ -29,7 +29,8 @@ struct aes_encoder::impl aes_encoder::aes_encoder() { - static __attribute__((unused)) int init = init_openssl(); + static int init = init_openssl(); + (void)init; } aes_encoder::~aes_encoder() @@ -97,7 +98,8 @@ struct aes_decoder::impl aes_decoder::aes_decoder() { - static __attribute__((unused)) int init = init_openssl(); + static int init = init_openssl(); + (void)init; } void aes_decoder::init( const fc::sha256& key, const fc::uint128& init_value ) diff --git a/src/crypto/elliptic_secp256k1.cpp b/src/crypto/elliptic_secp256k1.cpp index 469cc1b..ecb2c0c 100644 --- a/src/crypto/elliptic_secp256k1.cpp +++ b/src/crypto/elliptic_secp256k1.cpp @@ -29,8 +29,10 @@ namespace fc { namespace ecc { } void _init_lib() { - static __attribute__((unused)) const secp256k1_context_t* ctx = _get_context(); - static __attribute__((unused)) int init_o = init_openssl(); + static const secp256k1_context_t* ctx = _get_context(); + (void)ctx; + static int init_o = init_openssl(); + (void)init_o; } class public_key_impl diff --git a/src/crypto/rand.cpp b/src/crypto/rand.cpp index 2b194c5..6b26b46 100644 --- a/src/crypto/rand.cpp +++ b/src/crypto/rand.cpp @@ -8,7 +8,8 @@ namespace fc { void rand_bytes(char* buf, int count) { - static __attribute__((unused)) int init = init_openssl(); + static int init = init_openssl(); + (void)init; int result = RAND_bytes((unsigned char*)buf, count); if (result != 1) @@ -17,7 +18,8 @@ void rand_bytes(char* buf, int count) void rand_pseudo_bytes(char* buf, int count) { - static __attribute__((unused)) int init = init_openssl(); + static int init = init_openssl(); + (void)init; int result = RAND_pseudo_bytes((unsigned char*)buf, count); if (result == -1) From bf86466be1f027e4c48fda8d907c8ba779089f62 Mon Sep 17 00:00:00 2001 From: Anton Autushka Date: Tue, 6 Feb 2018 13:00:51 +0300 Subject: [PATCH 009/513] In static_variant use int64_t as a tag type --- include/fc/static_variant.hpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/include/fc/static_variant.hpp b/include/fc/static_variant.hpp index 4f13f5b..4bfca85 100644 --- a/include/fc/static_variant.hpp +++ b/include/fc/static_variant.hpp @@ -181,7 +181,8 @@ class static_variant { static_assert(impl::type_info::no_reference_types, "Reference types are not permitted in static_variant."); static_assert(impl::type_info::no_duplicates, "static_variant type arguments contain duplicate types."); - size_t _tag; + using tag_type = int64_t; + tag_type _tag; char storage[impl::type_info::size]; template @@ -326,14 +327,14 @@ public: } static int count() { return impl::type_info::count; } - void set_which( size_t w ) { + void set_which( tag_type w ) { FC_ASSERT( w < count() ); this->~static_variant(); _tag = w; impl::storage_ops<0, Types...>::con(_tag, storage); } - size_t which() const {return _tag;} + tag_type which() const {return _tag;} }; template From 7d7872cb7b490f0de9aae668c84e273c189168d4 Mon Sep 17 00:00:00 2001 From: Anton Autushka Date: Tue, 6 Feb 2018 15:37:14 +0300 Subject: [PATCH 010/513] some minor fixes --- CMakeLists.txt | 2 ++ include/fc/static_variant.hpp | 1 + src/thread/mutex.cpp | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1f7787d..d0819c0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,6 +4,8 @@ PROJECT( fc ) CMAKE_MINIMUM_REQUIRED( VERSION 2.8.12 ) +add_compile_options(-std=c++14) + MESSAGE(STATUS "Configuring project fc located in: ${CMAKE_CURRENT_SOURCE_DIR}") SET( CMAKE_AUTOMOC OFF ) diff --git a/include/fc/static_variant.hpp b/include/fc/static_variant.hpp index 4bfca85..d38408d 100644 --- a/include/fc/static_variant.hpp +++ b/include/fc/static_variant.hpp @@ -328,6 +328,7 @@ public: static int count() { return impl::type_info::count; } void set_which( tag_type w ) { + FC_ASSERT( w >= 0 ); FC_ASSERT( w < count() ); this->~static_variant(); _tag = w; diff --git a/src/thread/mutex.cpp b/src/thread/mutex.cpp index 2a87564..222d32e 100644 --- a/src/thread/mutex.cpp +++ b/src/thread/mutex.cpp @@ -15,9 +15,9 @@ namespace fc { mutex::~mutex() { if( m_blist ) { -// context* c = m_blist; fc::thread::current().debug("~mutex"); #if 0 + context* c = m_blist; while( c ) { // elog( "still blocking on context %p (%s)", m_blist, (m_blist->cur_task ? m_blist->cur_task->get_desc() : "no current task") ); c = c->next_blocked_mutex; From 48187769872f1ebab637321d41c8ccd021d5976c Mon Sep 17 00:00:00 2001 From: oxarbitrage Date: Tue, 6 Feb 2018 18:36:07 -0300 Subject: [PATCH 011/513] Add Doxyfile --- Doxyfile | 2362 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 2362 insertions(+) create mode 100644 Doxyfile diff --git a/Doxyfile b/Doxyfile new file mode 100644 index 0000000..c1948c9 --- /dev/null +++ b/Doxyfile @@ -0,0 +1,2362 @@ +# Doxyfile 1.8.9.1 + +# This file describes the settings to be used by the documentation system +# doxygen (www.doxygen.org) for a project. +# +# All text after a double hash (##) is considered a comment and is placed in +# front of the TAG it is preceding. +# +# All text after a single hash (#) is considered a comment and will be ignored. +# The format is: +# TAG = value [value, ...] +# For lists, items can also be appended using: +# TAG += value [value, ...] +# Values that contain spaces should be placed between quotes (\" \"). + +#--------------------------------------------------------------------------- +# Project related configuration options +#--------------------------------------------------------------------------- + +# This tag specifies the encoding used for all characters in the config file +# that follow. The default is UTF-8 which is also the encoding used for all text +# before the first occurrence of this tag. Doxygen uses libiconv (or the iconv +# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv +# for the list of possible encodings. +# The default value is: UTF-8. + +DOXYFILE_ENCODING = UTF-8 + +# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by +# double-quotes, unless you are using Doxywizard) that should identify the +# project for which the documentation is generated. This name is used in the +# title of most generated pages and in a few other places. +# The default value is: My Project. + +PROJECT_NAME = "Bitshares-FC" + +# The PROJECT_NUMBER tag can be used to enter a project or revision number. This +# could be handy for archiving the generated documentation or if some version +# control system is used. + +PROJECT_NUMBER = "1.0" + +# Using the PROJECT_BRIEF tag one can provide an optional one line description +# for a project that appears at the top of each page and should give viewer a +# quick idea about the purpose of the project. Keep the description short. + +PROJECT_BRIEF = "fast-compiling c++ library" + +# With the PROJECT_LOGO tag one can specify a logo or an icon that is included +# in the documentation. The maximum height of the logo should not exceed 55 +# pixels and the maximum width should not exceed 200 pixels. Doxygen will copy +# the logo to the output directory. + +PROJECT_LOGO = + +# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path +# into which the generated documentation will be written. If a relative path is +# entered, it will be relative to the location where doxygen was started. If +# left blank the current directory will be used. + +OUTPUT_DIRECTORY = doxygen + +# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub- +# directories (in 2 levels) under the output directory of each output format and +# will distribute the generated files over these directories. Enabling this +# option can be useful when feeding doxygen a huge amount of source files, where +# putting all generated files in the same directory would otherwise causes +# performance problems for the file system. +# The default value is: NO. + +CREATE_SUBDIRS = NO + +# If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII +# characters to appear in the names of generated files. If set to NO, non-ASCII +# characters will be escaped, for example _xE3_x81_x84 will be used for Unicode +# U+3044. +# The default value is: NO. + +ALLOW_UNICODE_NAMES = NO + +# The OUTPUT_LANGUAGE tag is used to specify the language in which all +# documentation generated by doxygen is written. Doxygen will use this +# information to generate all constant output in the proper language. +# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese, +# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States), +# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian, +# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages), +# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian, +# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian, +# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish, +# Ukrainian and Vietnamese. +# The default value is: English. + +OUTPUT_LANGUAGE = English + +# If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member +# descriptions after the members that are listed in the file and class +# documentation (similar to Javadoc). Set to NO to disable this. +# The default value is: YES. + +BRIEF_MEMBER_DESC = YES + +# If the REPEAT_BRIEF tag is set to YES, doxygen will prepend the brief +# description of a member or function before the detailed description +# +# Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the +# brief descriptions will be completely suppressed. +# The default value is: YES. + +REPEAT_BRIEF = YES + +# This tag implements a quasi-intelligent brief description abbreviator that is +# used to form the text in various listings. Each string in this list, if found +# as the leading text of the brief description, will be stripped from the text +# and the result, after processing the whole list, is used as the annotated +# text. Otherwise, the brief description is used as-is. If left blank, the +# following values are used ($name is automatically replaced with the name of +# the entity):The $name class, The $name widget, The $name file, is, provides, +# specifies, contains, represents, a, an and the. + +ABBREVIATE_BRIEF = + +# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then +# doxygen will generate a detailed section even if there is only a brief +# description. +# The default value is: NO. + +ALWAYS_DETAILED_SEC = NO + +# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all +# inherited members of a class in the documentation of that class as if those +# members were ordinary class members. Constructors, destructors and assignment +# operators of the base classes will not be shown. +# The default value is: NO. + +INLINE_INHERITED_MEMB = NO + +# If the FULL_PATH_NAMES tag is set to YES, doxygen will prepend the full path +# before files name in the file list and in the header files. If set to NO the +# shortest path that makes the file name unique will be used +# The default value is: YES. + +FULL_PATH_NAMES = YES + +# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path. +# Stripping is only done if one of the specified strings matches the left-hand +# part of the path. The tag can be used to show relative paths in the file list. +# If left blank the directory from which doxygen is run is used as the path to +# strip. +# +# Note that you can specify absolute paths here, but also relative paths, which +# will be relative from the directory where doxygen is started. +# This tag requires that the tag FULL_PATH_NAMES is set to YES. + +STRIP_FROM_PATH = + +# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the +# path mentioned in the documentation of a class, which tells the reader which +# header file to include in order to use a class. If left blank only the name of +# the header file containing the class definition is used. Otherwise one should +# specify the list of include paths that are normally passed to the compiler +# using the -I flag. + +STRIP_FROM_INC_PATH = + +# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but +# less readable) file names. This can be useful is your file systems doesn't +# support long names like on DOS, Mac, or CD-ROM. +# The default value is: NO. + +SHORT_NAMES = NO + +# If the JAVADOC_AUTOBRIEF tag is set to YES then doxygen will interpret the +# first line (until the first dot) of a Javadoc-style comment as the brief +# description. If set to NO, the Javadoc-style will behave just like regular Qt- +# style comments (thus requiring an explicit @brief command for a brief +# description.) +# The default value is: NO. + +JAVADOC_AUTOBRIEF = NO + +# If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first +# line (until the first dot) of a Qt-style comment as the brief description. If +# set to NO, the Qt-style will behave just like regular Qt-style comments (thus +# requiring an explicit \brief command for a brief description.) +# The default value is: NO. + +QT_AUTOBRIEF = NO + +# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a +# multi-line C++ special comment block (i.e. a block of //! or /// comments) as +# a brief description. This used to be the default behavior. The new default is +# to treat a multi-line C++ comment block as a detailed description. Set this +# tag to YES if you prefer the old behavior instead. +# +# Note that setting this tag to YES also means that rational rose comments are +# not recognized any more. +# The default value is: NO. + +MULTILINE_CPP_IS_BRIEF = NO + +# If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the +# documentation from any documented member that it re-implements. +# The default value is: YES. + +INHERIT_DOCS = YES + +# If the SEPARATE_MEMBER_PAGES tag is set to YES then doxygen will produce a new +# page for each member. If set to NO, the documentation of a member will be part +# of the file/class/namespace that contains it. +# The default value is: NO. + +SEPARATE_MEMBER_PAGES = NO + +# The TAB_SIZE tag can be used to set the number of spaces in a tab. Doxygen +# uses this value to replace tabs by spaces in code fragments. +# Minimum value: 1, maximum value: 16, default value: 4. + +TAB_SIZE = 4 + +# This tag can be used to specify a number of aliases that act as commands in +# the documentation. An alias has the form: +# name=value +# For example adding +# "sideeffect=@par Side Effects:\n" +# will allow you to put the command \sideeffect (or @sideeffect) in the +# documentation, which will result in a user-defined paragraph with heading +# "Side Effects:". You can put \n's in the value part of an alias to insert +# newlines. + +ALIASES = + +# This tag can be used to specify a number of word-keyword mappings (TCL only). +# A mapping has the form "name=value". For example adding "class=itcl::class" +# will allow you to use the command class in the itcl::class meaning. + +TCL_SUBST = + +# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources +# only. Doxygen will then generate output that is more tailored for C. For +# instance, some of the names that are used will be different. The list of all +# members will be omitted, etc. +# The default value is: NO. + +OPTIMIZE_OUTPUT_FOR_C = NO + +# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or +# Python sources only. Doxygen will then generate output that is more tailored +# for that language. For instance, namespaces will be presented as packages, +# qualified scopes will look different, etc. +# The default value is: NO. + +OPTIMIZE_OUTPUT_JAVA = NO + +# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran +# sources. Doxygen will then generate output that is tailored for Fortran. +# The default value is: NO. + +OPTIMIZE_FOR_FORTRAN = NO + +# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL +# sources. Doxygen will then generate output that is tailored for VHDL. +# The default value is: NO. + +OPTIMIZE_OUTPUT_VHDL = NO + +# Doxygen selects the parser to use depending on the extension of the files it +# parses. With this tag you can assign which parser to use for a given +# extension. Doxygen has a built-in mapping, but you can override or extend it +# using this tag. The format is ext=language, where ext is a file extension, and +# language is one of the parsers supported by doxygen: IDL, Java, Javascript, +# C#, C, C++, D, PHP, Objective-C, Python, Fortran (fixed format Fortran: +# FortranFixed, free formatted Fortran: FortranFree, unknown formatted Fortran: +# Fortran. In the later case the parser tries to guess whether the code is fixed +# or free formatted code, this is the default for Fortran type files), VHDL. For +# instance to make doxygen treat .inc files as Fortran files (default is PHP), +# and .f files as C (default is Fortran), use: inc=Fortran f=C. +# +# Note: For files without extension you can use no_extension as a placeholder. +# +# Note that for custom extensions you also need to set FILE_PATTERNS otherwise +# the files are not read by doxygen. + +EXTENSION_MAPPING = + +# If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments +# according to the Markdown format, which allows for more readable +# documentation. See http://daringfireball.net/projects/markdown/ for details. +# The output of markdown processing is further processed by doxygen, so you can +# mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in +# case of backward compatibilities issues. +# The default value is: YES. + +MARKDOWN_SUPPORT = YES + +# When enabled doxygen tries to link words that correspond to documented +# classes, or namespaces to their corresponding documentation. Such a link can +# be prevented in individual cases by putting a % sign in front of the word or +# globally by setting AUTOLINK_SUPPORT to NO. +# The default value is: YES. + +AUTOLINK_SUPPORT = YES + +# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want +# to include (a tag file for) the STL sources as input, then you should set this +# tag to YES in order to let doxygen match functions declarations and +# definitions whose arguments contain STL classes (e.g. func(std::string); +# versus func(std::string) {}). This also make the inheritance and collaboration +# diagrams that involve STL classes more complete and accurate. +# The default value is: NO. + +BUILTIN_STL_SUPPORT = NO + +# If you use Microsoft's C++/CLI language, you should set this option to YES to +# enable parsing support. +# The default value is: NO. + +CPP_CLI_SUPPORT = NO + +# Set the SIP_SUPPORT tag to YES if your project consists of sip (see: +# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen +# will parse them like normal C++ but will assume all classes use public instead +# of private inheritance when no explicit protection keyword is present. +# The default value is: NO. + +SIP_SUPPORT = NO + +# For Microsoft's IDL there are propget and propput attributes to indicate +# getter and setter methods for a property. Setting this option to YES will make +# doxygen to replace the get and set methods by a property in the documentation. +# This will only work if the methods are indeed getting or setting a simple +# type. If this is not the case, or you want to show the methods anyway, you +# should set this option to NO. +# The default value is: YES. + +IDL_PROPERTY_SUPPORT = YES + +# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC +# tag is set to YES then doxygen will reuse the documentation of the first +# member in the group (if any) for the other members of the group. By default +# all members of a group must be documented explicitly. +# The default value is: NO. + +DISTRIBUTE_GROUP_DOC = NO + +# Set the SUBGROUPING tag to YES to allow class member groups of the same type +# (for instance a group of public functions) to be put as a subgroup of that +# type (e.g. under the Public Functions section). Set it to NO to prevent +# subgrouping. Alternatively, this can be done per class using the +# \nosubgrouping command. +# The default value is: YES. + +SUBGROUPING = YES + +# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and unions +# are shown inside the group in which they are included (e.g. using \ingroup) +# instead of on a separate page (for HTML and Man pages) or section (for LaTeX +# and RTF). +# +# Note that this feature does not work in combination with +# SEPARATE_MEMBER_PAGES. +# The default value is: NO. + +INLINE_GROUPED_CLASSES = NO + +# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and unions +# with only public data fields or simple typedef fields will be shown inline in +# the documentation of the scope in which they are defined (i.e. file, +# namespace, or group documentation), provided this scope is documented. If set +# to NO, structs, classes, and unions are shown on a separate page (for HTML and +# Man pages) or section (for LaTeX and RTF). +# The default value is: NO. + +INLINE_SIMPLE_STRUCTS = NO + +# When TYPEDEF_HIDES_STRUCT tag is enabled, a typedef of a struct, union, or +# enum is documented as struct, union, or enum with the name of the typedef. So +# typedef struct TypeS {} TypeT, will appear in the documentation as a struct +# with name TypeT. When disabled the typedef will appear as a member of a file, +# namespace, or class. And the struct will be named TypeS. This can typically be +# useful for C code in case the coding convention dictates that all compound +# types are typedef'ed and only the typedef is referenced, never the tag name. +# The default value is: NO. + +TYPEDEF_HIDES_STRUCT = NO + +# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This +# cache is used to resolve symbols given their name and scope. Since this can be +# an expensive process and often the same symbol appears multiple times in the +# code, doxygen keeps a cache of pre-resolved symbols. If the cache is too small +# doxygen will become slower. If the cache is too large, memory is wasted. The +# cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range +# is 0..9, the default is 0, corresponding to a cache size of 2^16=65536 +# symbols. At the end of a run doxygen will report the cache usage and suggest +# the optimal cache size from a speed point of view. +# Minimum value: 0, maximum value: 9, default value: 0. + +LOOKUP_CACHE_SIZE = 0 + +#--------------------------------------------------------------------------- +# Build related configuration options +#--------------------------------------------------------------------------- + +# If the EXTRACT_ALL tag is set to YES, doxygen will assume all entities in +# documentation are documented, even if no documentation was available. Private +# class members and static file members will be hidden unless the +# EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES. +# Note: This will also disable the warnings about undocumented members that are +# normally produced when WARNINGS is set to YES. +# The default value is: NO. + +EXTRACT_ALL = YES + +# If the EXTRACT_PRIVATE tag is set to YES, all private members of a class will +# be included in the documentation. +# The default value is: NO. + +EXTRACT_PRIVATE = NO + +# If the EXTRACT_PACKAGE tag is set to YES, all members with package or internal +# scope will be included in the documentation. +# The default value is: NO. + +EXTRACT_PACKAGE = NO + +# If the EXTRACT_STATIC tag is set to YES, all static members of a file will be +# included in the documentation. +# The default value is: NO. + +EXTRACT_STATIC = NO + +# If the EXTRACT_LOCAL_CLASSES tag is set to YES, classes (and structs) defined +# locally in source files will be included in the documentation. If set to NO, +# only classes defined in header files are included. Does not have any effect +# for Java sources. +# The default value is: YES. + +EXTRACT_LOCAL_CLASSES = YES + +# This flag is only useful for Objective-C code. If set to YES, local methods, +# which are defined in the implementation section but not in the interface are +# included in the documentation. If set to NO, only methods in the interface are +# included. +# The default value is: NO. + +EXTRACT_LOCAL_METHODS = NO + +# If this flag is set to YES, the members of anonymous namespaces will be +# extracted and appear in the documentation as a namespace called +# 'anonymous_namespace{file}', where file will be replaced with the base name of +# the file that contains the anonymous namespace. By default anonymous namespace +# are hidden. +# The default value is: NO. + +EXTRACT_ANON_NSPACES = NO + +# If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all +# undocumented members inside documented classes or files. If set to NO these +# members will be included in the various overviews, but no documentation +# section is generated. This option has no effect if EXTRACT_ALL is enabled. +# The default value is: NO. + +HIDE_UNDOC_MEMBERS = NO + +# If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all +# undocumented classes that are normally visible in the class hierarchy. If set +# to NO, these classes will be included in the various overviews. This option +# has no effect if EXTRACT_ALL is enabled. +# The default value is: NO. + +HIDE_UNDOC_CLASSES = NO + +# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend +# (class|struct|union) declarations. If set to NO, these declarations will be +# included in the documentation. +# The default value is: NO. + +HIDE_FRIEND_COMPOUNDS = NO + +# If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any +# documentation blocks found inside the body of a function. If set to NO, these +# blocks will be appended to the function's detailed documentation block. +# The default value is: NO. + +HIDE_IN_BODY_DOCS = NO + +# The INTERNAL_DOCS tag determines if documentation that is typed after a +# \internal command is included. If the tag is set to NO then the documentation +# will be excluded. Set it to YES to include the internal documentation. +# The default value is: NO. + +INTERNAL_DOCS = NO + +# If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file +# names in lower-case letters. If set to YES, upper-case letters are also +# allowed. This is useful if you have classes or files whose names only differ +# in case and if your file system supports case sensitive file names. Windows +# and Mac users are advised to set this option to NO. +# The default value is: system dependent. + +CASE_SENSE_NAMES = NO + +# If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with +# their full class and namespace scopes in the documentation. If set to YES, the +# scope will be hidden. +# The default value is: NO. + +HIDE_SCOPE_NAMES = NO + +# If the HIDE_COMPOUND_REFERENCE tag is set to NO (default) then doxygen will +# append additional text to a page's title, such as Class Reference. If set to +# YES the compound reference will be hidden. +# The default value is: NO. + +HIDE_COMPOUND_REFERENCE= NO + +# If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of +# the files that are included by a file in the documentation of that file. +# The default value is: YES. + +SHOW_INCLUDE_FILES = YES + +# If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each +# grouped member an include statement to the documentation, telling the reader +# which file to include in order to use the member. +# The default value is: NO. + +SHOW_GROUPED_MEMB_INC = NO + +# If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include +# files with double quotes in the documentation rather than with sharp brackets. +# The default value is: NO. + +FORCE_LOCAL_INCLUDES = NO + +# If the INLINE_INFO tag is set to YES then a tag [inline] is inserted in the +# documentation for inline members. +# The default value is: YES. + +INLINE_INFO = YES + +# If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the +# (detailed) documentation of file and class members alphabetically by member +# name. If set to NO, the members will appear in declaration order. +# The default value is: YES. + +SORT_MEMBER_DOCS = YES + +# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief +# descriptions of file, namespace and class members alphabetically by member +# name. If set to NO, the members will appear in declaration order. Note that +# this will also influence the order of the classes in the class list. +# The default value is: NO. + +SORT_BRIEF_DOCS = NO + +# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the +# (brief and detailed) documentation of class members so that constructors and +# destructors are listed first. If set to NO the constructors will appear in the +# respective orders defined by SORT_BRIEF_DOCS and SORT_MEMBER_DOCS. +# Note: If SORT_BRIEF_DOCS is set to NO this option is ignored for sorting brief +# member documentation. +# Note: If SORT_MEMBER_DOCS is set to NO this option is ignored for sorting +# detailed member documentation. +# The default value is: NO. + +SORT_MEMBERS_CTORS_1ST = NO + +# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy +# of group names into alphabetical order. If set to NO the group names will +# appear in their defined order. +# The default value is: NO. + +SORT_GROUP_NAMES = NO + +# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be sorted by +# fully-qualified names, including namespaces. If set to NO, the class list will +# be sorted only by class name, not including the namespace part. +# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. +# Note: This option applies only to the class list, not to the alphabetical +# list. +# The default value is: NO. + +SORT_BY_SCOPE_NAME = NO + +# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper +# type resolution of all parameters of a function it will reject a match between +# the prototype and the implementation of a member function even if there is +# only one candidate or it is obvious which candidate to choose by doing a +# simple string match. By disabling STRICT_PROTO_MATCHING doxygen will still +# accept a match between prototype and implementation in such cases. +# The default value is: NO. + +STRICT_PROTO_MATCHING = NO + +# The GENERATE_TODOLIST tag can be used to enable (YES) or disable (NO) the todo +# list. This list is created by putting \todo commands in the documentation. +# The default value is: YES. + +GENERATE_TODOLIST = YES + +# The GENERATE_TESTLIST tag can be used to enable (YES) or disable (NO) the test +# list. This list is created by putting \test commands in the documentation. +# The default value is: YES. + +GENERATE_TESTLIST = YES + +# The GENERATE_BUGLIST tag can be used to enable (YES) or disable (NO) the bug +# list. This list is created by putting \bug commands in the documentation. +# The default value is: YES. + +GENERATE_BUGLIST = YES + +# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or disable (NO) +# the deprecated list. This list is created by putting \deprecated commands in +# the documentation. +# The default value is: YES. + +GENERATE_DEPRECATEDLIST= YES + +# The ENABLED_SECTIONS tag can be used to enable conditional documentation +# sections, marked by \if ... \endif and \cond +# ... \endcond blocks. + +ENABLED_SECTIONS = + +# The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the +# initial value of a variable or macro / define can have for it to appear in the +# documentation. If the initializer consists of more lines than specified here +# it will be hidden. Use a value of 0 to hide initializers completely. The +# appearance of the value of individual variables and macros / defines can be +# controlled using \showinitializer or \hideinitializer command in the +# documentation regardless of this setting. +# Minimum value: 0, maximum value: 10000, default value: 30. + +MAX_INITIALIZER_LINES = 30 + +# Set the SHOW_USED_FILES tag to NO to disable the list of files generated at +# the bottom of the documentation of classes and structs. If set to YES, the +# list will mention the files that were used to generate the documentation. +# The default value is: YES. + +SHOW_USED_FILES = YES + +# Set the SHOW_FILES tag to NO to disable the generation of the Files page. This +# will remove the Files entry from the Quick Index and from the Folder Tree View +# (if specified). +# The default value is: YES. + +SHOW_FILES = YES + +# Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces +# page. This will remove the Namespaces entry from the Quick Index and from the +# Folder Tree View (if specified). +# The default value is: YES. + +SHOW_NAMESPACES = YES + +# The FILE_VERSION_FILTER tag can be used to specify a program or script that +# doxygen should invoke to get the current version for each file (typically from +# the version control system). Doxygen will invoke the program by executing (via +# popen()) the command command input-file, where command is the value of the +# FILE_VERSION_FILTER tag, and input-file is the name of an input file provided +# by doxygen. Whatever the program writes to standard output is used as the file +# version. For an example see the documentation. + +FILE_VERSION_FILTER = + +# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed +# by doxygen. The layout file controls the global structure of the generated +# output files in an output format independent way. To create the layout file +# that represents doxygen's defaults, run doxygen with the -l option. You can +# optionally specify a file name after the option, if omitted DoxygenLayout.xml +# will be used as the name of the layout file. +# +# Note that if you run doxygen from a directory containing a file called +# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE +# tag is left empty. + +LAYOUT_FILE = + +# The CITE_BIB_FILES tag can be used to specify one or more bib files containing +# the reference definitions. This must be a list of .bib files. The .bib +# extension is automatically appended if omitted. This requires the bibtex tool +# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info. +# For LaTeX the style of the bibliography can be controlled using +# LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the +# search path. See also \cite for info how to create references. + +CITE_BIB_FILES = + +#--------------------------------------------------------------------------- +# Configuration options related to warning and progress messages +#--------------------------------------------------------------------------- + +# The QUIET tag can be used to turn on/off the messages that are generated to +# standard output by doxygen. If QUIET is set to YES this implies that the +# messages are off. +# The default value is: NO. + +QUIET = NO + +# The WARNINGS tag can be used to turn on/off the warning messages that are +# generated to standard error (stderr) by doxygen. If WARNINGS is set to YES +# this implies that the warnings are on. +# +# Tip: Turn warnings on while writing the documentation. +# The default value is: YES. + +WARNINGS = YES + +# If the WARN_IF_UNDOCUMENTED tag is set to YES then doxygen will generate +# warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag +# will automatically be disabled. +# The default value is: YES. + +WARN_IF_UNDOCUMENTED = YES + +# If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for +# potential errors in the documentation, such as not documenting some parameters +# in a documented function, or documenting parameters that don't exist or using +# markup commands wrongly. +# The default value is: YES. + +WARN_IF_DOC_ERROR = YES + +# This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that +# are documented, but have no documentation for their parameters or return +# value. If set to NO, doxygen will only warn about wrong or incomplete +# parameter documentation, but not about the absence of documentation. +# The default value is: NO. + +WARN_NO_PARAMDOC = NO + +# The WARN_FORMAT tag determines the format of the warning messages that doxygen +# can produce. The string should contain the $file, $line, and $text tags, which +# will be replaced by the file and line number from which the warning originated +# and the warning text. Optionally the format may contain $version, which will +# be replaced by the version of the file (if it could be obtained via +# FILE_VERSION_FILTER) +# The default value is: $file:$line: $text. + +WARN_FORMAT = "$file:$line: $text" + +# The WARN_LOGFILE tag can be used to specify a file to which warning and error +# messages should be written. If left blank the output is written to standard +# error (stderr). + +WARN_LOGFILE = + +#--------------------------------------------------------------------------- +# Configuration options related to the input files +#--------------------------------------------------------------------------- + +# The INPUT tag is used to specify the files and/or directories that contain +# documented source files. You may enter file names like myfile.cpp or +# directories like /usr/src/myproject. Separate the files or directories with +# spaces. +# Note: If this tag is empty the current directory is searched. + +INPUT = README.md src include/fc + +# This tag can be used to specify the character encoding of the source files +# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses +# libiconv (or the iconv built into libc) for the transcoding. See the libiconv +# documentation (see: http://www.gnu.org/software/libiconv) for the list of +# possible encodings. +# The default value is: UTF-8. + +INPUT_ENCODING = UTF-8 + +# If the value of the INPUT tag contains directories, you can use the +# FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and +# *.h) to filter out the source-files in the directories. If left blank the +# following patterns are tested:*.c, *.cc, *.cxx, *.cpp, *.c++, *.java, *.ii, +# *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h, *.hh, *.hxx, *.hpp, +# *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc, *.m, *.markdown, +# *.md, *.mm, *.dox, *.py, *.f90, *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf, +# *.qsf, *.as and *.js. + +FILE_PATTERNS = + +# The RECURSIVE tag can be used to specify whether or not subdirectories should +# be searched for input files as well. +# The default value is: NO. + +RECURSIVE = YES + +# The EXCLUDE tag can be used to specify files and/or directories that should be +# excluded from the INPUT source files. This way you can easily exclude a +# subdirectory from a directory tree whose root is specified with the INPUT tag. +# +# Note that relative paths are relative to the directory from which doxygen is +# run. + +EXCLUDE = + +# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or +# directories that are symbolic links (a Unix file system feature) are excluded +# from the input. +# The default value is: NO. + +EXCLUDE_SYMLINKS = NO + +# If the value of the INPUT tag contains directories, you can use the +# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude +# certain files from those directories. +# +# Note that the wildcards are matched against the file with absolute path, so to +# exclude all test directories for example use the pattern */test/* + +EXCLUDE_PATTERNS = + +# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names +# (namespaces, classes, functions, etc.) that should be excluded from the +# output. The symbol name can be a fully qualified name, a word, or if the +# wildcard * is used, a substring. Examples: ANamespace, AClass, +# AClass::ANamespace, ANamespace::*Test +# +# Note that the wildcards are matched against the file with absolute path, so to +# exclude all test directories use the pattern */test/* + +EXCLUDE_SYMBOLS = + +# The EXAMPLE_PATH tag can be used to specify one or more files or directories +# that contain example code fragments that are included (see the \include +# command). + +EXAMPLE_PATH = + +# If the value of the EXAMPLE_PATH tag contains directories, you can use the +# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and +# *.h) to filter out the source-files in the directories. If left blank all +# files are included. + +EXAMPLE_PATTERNS = + +# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be +# searched for input files to be used with the \include or \dontinclude commands +# irrespective of the value of the RECURSIVE tag. +# The default value is: NO. + +EXAMPLE_RECURSIVE = NO + +# The IMAGE_PATH tag can be used to specify one or more files or directories +# that contain images that are to be included in the documentation (see the +# \image command). + +IMAGE_PATH = + +# The INPUT_FILTER tag can be used to specify a program that doxygen should +# invoke to filter for each input file. Doxygen will invoke the filter program +# by executing (via popen()) the command: +# +# +# +# where is the value of the INPUT_FILTER tag, and is the +# name of an input file. Doxygen will then use the output that the filter +# program writes to standard output. If FILTER_PATTERNS is specified, this tag +# will be ignored. +# +# Note that the filter must not add or remove lines; it is applied before the +# code is scanned, but not when the output code is generated. If lines are added +# or removed, the anchors will not be placed correctly. + +INPUT_FILTER = + +# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern +# basis. Doxygen will compare the file name with each pattern and apply the +# filter if there is a match. The filters are a list of the form: pattern=filter +# (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how +# filters are used. If the FILTER_PATTERNS tag is empty or if none of the +# patterns match the file name, INPUT_FILTER is applied. + +FILTER_PATTERNS = + +# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using +# INPUT_FILTER) will also be used to filter the input files that are used for +# producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES). +# The default value is: NO. + +FILTER_SOURCE_FILES = NO + +# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file +# pattern. A pattern will override the setting for FILTER_PATTERN (if any) and +# it is also possible to disable source filtering for a specific pattern using +# *.ext= (so without naming a filter). +# This tag requires that the tag FILTER_SOURCE_FILES is set to YES. + +FILTER_SOURCE_PATTERNS = + +# If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that +# is part of the input, its contents will be placed on the main page +# (index.html). This can be useful if you have a project on for instance GitHub +# and want to reuse the introduction page also for the doxygen output. + +USE_MDFILE_AS_MAINPAGE = "README.md" + +#--------------------------------------------------------------------------- +# Configuration options related to source browsing +#--------------------------------------------------------------------------- + +# If the SOURCE_BROWSER tag is set to YES then a list of source files will be +# generated. Documented entities will be cross-referenced with these sources. +# +# Note: To get rid of all source code in the generated output, make sure that +# also VERBATIM_HEADERS is set to NO. +# The default value is: NO. + +SOURCE_BROWSER = YES + +# Setting the INLINE_SOURCES tag to YES will include the body of functions, +# classes and enums directly into the documentation. +# The default value is: NO. + +INLINE_SOURCES = NO + +# Setting the STRIP_CODE_COMMENTS tag to YES will instruct doxygen to hide any +# special comment blocks from generated source code fragments. Normal C, C++ and +# Fortran comments will always remain visible. +# The default value is: YES. + +STRIP_CODE_COMMENTS = YES + +# If the REFERENCED_BY_RELATION tag is set to YES then for each documented +# function all documented functions referencing it will be listed. +# The default value is: NO. + +REFERENCED_BY_RELATION = NO + +# If the REFERENCES_RELATION tag is set to YES then for each documented function +# all documented entities called/used by that function will be listed. +# The default value is: NO. + +REFERENCES_RELATION = NO + +# If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set +# to YES then the hyperlinks from functions in REFERENCES_RELATION and +# REFERENCED_BY_RELATION lists will link to the source code. Otherwise they will +# link to the documentation. +# The default value is: YES. + +REFERENCES_LINK_SOURCE = YES + +# If SOURCE_TOOLTIPS is enabled (the default) then hovering a hyperlink in the +# source code will show a tooltip with additional information such as prototype, +# brief description and links to the definition and documentation. Since this +# will make the HTML file larger and loading of large files a bit slower, you +# can opt to disable this feature. +# The default value is: YES. +# This tag requires that the tag SOURCE_BROWSER is set to YES. + +SOURCE_TOOLTIPS = YES + +# If the USE_HTAGS tag is set to YES then the references to source code will +# point to the HTML generated by the htags(1) tool instead of doxygen built-in +# source browser. The htags tool is part of GNU's global source tagging system +# (see http://www.gnu.org/software/global/global.html). You will need version +# 4.8.6 or higher. +# +# To use it do the following: +# - Install the latest version of global +# - Enable SOURCE_BROWSER and USE_HTAGS in the config file +# - Make sure the INPUT points to the root of the source tree +# - Run doxygen as normal +# +# Doxygen will invoke htags (and that will in turn invoke gtags), so these +# tools must be available from the command line (i.e. in the search path). +# +# The result: instead of the source browser generated by doxygen, the links to +# source code will now point to the output of htags. +# The default value is: NO. +# This tag requires that the tag SOURCE_BROWSER is set to YES. + +USE_HTAGS = NO + +# If the VERBATIM_HEADERS tag is set the YES then doxygen will generate a +# verbatim copy of the header file for each class for which an include is +# specified. Set to NO to disable this. +# See also: Section \class. +# The default value is: YES. + +VERBATIM_HEADERS = YES + +#--------------------------------------------------------------------------- +# Configuration options related to the alphabetical class index +#--------------------------------------------------------------------------- + +# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index of all +# compounds will be generated. Enable this if the project contains a lot of +# classes, structs, unions or interfaces. +# The default value is: YES. + +ALPHABETICAL_INDEX = YES + +# The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns in +# which the alphabetical index list will be split. +# Minimum value: 1, maximum value: 20, default value: 5. +# This tag requires that the tag ALPHABETICAL_INDEX is set to YES. + +COLS_IN_ALPHA_INDEX = 5 + +# In case all classes in a project start with a common prefix, all classes will +# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag +# can be used to specify a prefix (or a list of prefixes) that should be ignored +# while generating the index headers. +# This tag requires that the tag ALPHABETICAL_INDEX is set to YES. + +IGNORE_PREFIX = + +#--------------------------------------------------------------------------- +# Configuration options related to the HTML output +#--------------------------------------------------------------------------- + +# If the GENERATE_HTML tag is set to YES, doxygen will generate HTML output +# The default value is: YES. + +GENERATE_HTML = YES + +# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a +# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of +# it. +# The default directory is: html. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_OUTPUT = html + +# The HTML_FILE_EXTENSION tag can be used to specify the file extension for each +# generated HTML page (for example: .htm, .php, .asp). +# The default value is: .html. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_FILE_EXTENSION = .html + +# The HTML_HEADER tag can be used to specify a user-defined HTML header file for +# each generated HTML page. If the tag is left blank doxygen will generate a +# standard header. +# +# To get valid HTML the header file that includes any scripts and style sheets +# that doxygen needs, which is dependent on the configuration options used (e.g. +# the setting GENERATE_TREEVIEW). It is highly recommended to start with a +# default header using +# doxygen -w html new_header.html new_footer.html new_stylesheet.css +# YourConfigFile +# and then modify the file new_header.html. See also section "Doxygen usage" +# for information on how to generate the default header that doxygen normally +# uses. +# Note: The header is subject to change so you typically have to regenerate the +# default header when upgrading to a newer version of doxygen. For a description +# of the possible markers and block names see the documentation. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_HEADER = + +# The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each +# generated HTML page. If the tag is left blank doxygen will generate a standard +# footer. See HTML_HEADER for more information on how to generate a default +# footer and what special commands can be used inside the footer. See also +# section "Doxygen usage" for information on how to generate the default footer +# that doxygen normally uses. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_FOOTER = + +# The HTML_STYLESHEET tag can be used to specify a user-defined cascading style +# sheet that is used by each HTML page. It can be used to fine-tune the look of +# the HTML output. If left blank doxygen will generate a default style sheet. +# See also section "Doxygen usage" for information on how to generate the style +# sheet that doxygen normally uses. +# Note: It is recommended to use HTML_EXTRA_STYLESHEET instead of this tag, as +# it is more robust and this tag (HTML_STYLESHEET) will in the future become +# obsolete. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_STYLESHEET = + +# The HTML_EXTRA_STYLESHEET tag can be used to specify additional user-defined +# cascading style sheets that are included after the standard style sheets +# created by doxygen. Using this option one can overrule certain style aspects. +# This is preferred over using HTML_STYLESHEET since it does not replace the +# standard style sheet and is therefore more robust against future updates. +# Doxygen will copy the style sheet files to the output directory. +# Note: The order of the extra style sheet files is of importance (e.g. the last +# style sheet in the list overrules the setting of the previous ones in the +# list). For an example see the documentation. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_EXTRA_STYLESHEET = + +# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or +# other source files which should be copied to the HTML output directory. Note +# that these files will be copied to the base HTML output directory. Use the +# $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these +# files. In the HTML_STYLESHEET file, use the file name only. Also note that the +# files will be copied as-is; there are no commands or markers available. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_EXTRA_FILES = + +# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen +# will adjust the colors in the style sheet and background images according to +# this color. Hue is specified as an angle on a colorwheel, see +# http://en.wikipedia.org/wiki/Hue for more information. For instance the value +# 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300 +# purple, and 360 is red again. +# Minimum value: 0, maximum value: 359, default value: 220. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_COLORSTYLE_HUE = 220 + +# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors +# in the HTML output. For a value of 0 the output will use grayscales only. A +# value of 255 will produce the most vivid colors. +# Minimum value: 0, maximum value: 255, default value: 100. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_COLORSTYLE_SAT = 100 + +# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the +# luminance component of the colors in the HTML output. Values below 100 +# gradually make the output lighter, whereas values above 100 make the output +# darker. The value divided by 100 is the actual gamma applied, so 80 represents +# a gamma of 0.8, The value 220 represents a gamma of 2.2, and 100 does not +# change the gamma. +# Minimum value: 40, maximum value: 240, default value: 80. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_COLORSTYLE_GAMMA = 80 + +# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML +# page will contain the date and time when the page was generated. Setting this +# to NO can help when comparing the output of multiple runs. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_TIMESTAMP = YES + +# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML +# documentation will contain sections that can be hidden and shown after the +# page has loaded. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_DYNAMIC_SECTIONS = NO + +# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries +# shown in the various tree structured indices initially; the user can expand +# and collapse entries dynamically later on. Doxygen will expand the tree to +# such a level that at most the specified number of entries are visible (unless +# a fully collapsed tree already exceeds this amount). So setting the number of +# entries 1 will produce a full collapsed tree by default. 0 is a special value +# representing an infinite number of entries and will result in a full expanded +# tree by default. +# Minimum value: 0, maximum value: 9999, default value: 100. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_INDEX_NUM_ENTRIES = 100 + +# If the GENERATE_DOCSET tag is set to YES, additional index files will be +# generated that can be used as input for Apple's Xcode 3 integrated development +# environment (see: http://developer.apple.com/tools/xcode/), introduced with +# OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a +# Makefile in the HTML output directory. Running make will produce the docset in +# that directory and running make install will install the docset in +# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at +# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html +# for more information. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +GENERATE_DOCSET = NO + +# This tag determines the name of the docset feed. A documentation feed provides +# an umbrella under which multiple documentation sets from a single provider +# (such as a company or product suite) can be grouped. +# The default value is: Doxygen generated docs. +# This tag requires that the tag GENERATE_DOCSET is set to YES. + +DOCSET_FEEDNAME = "Doxygen generated docs" + +# This tag specifies a string that should uniquely identify the documentation +# set bundle. This should be a reverse domain-name style string, e.g. +# com.mycompany.MyDocSet. Doxygen will append .docset to the name. +# The default value is: org.doxygen.Project. +# This tag requires that the tag GENERATE_DOCSET is set to YES. + +DOCSET_BUNDLE_ID = org.doxygen.Project + +# The DOCSET_PUBLISHER_ID tag specifies a string that should uniquely identify +# the documentation publisher. This should be a reverse domain-name style +# string, e.g. com.mycompany.MyDocSet.documentation. +# The default value is: org.doxygen.Publisher. +# This tag requires that the tag GENERATE_DOCSET is set to YES. + +DOCSET_PUBLISHER_ID = org.doxygen.Publisher + +# The DOCSET_PUBLISHER_NAME tag identifies the documentation publisher. +# The default value is: Publisher. +# This tag requires that the tag GENERATE_DOCSET is set to YES. + +DOCSET_PUBLISHER_NAME = Publisher + +# If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three +# additional HTML index files: index.hhp, index.hhc, and index.hhk. The +# index.hhp is a project file that can be read by Microsoft's HTML Help Workshop +# (see: http://www.microsoft.com/en-us/download/details.aspx?id=21138) on +# Windows. +# +# The HTML Help Workshop contains a compiler that can convert all HTML output +# generated by doxygen into a single compiled HTML file (.chm). Compiled HTML +# files are now used as the Windows 98 help format, and will replace the old +# Windows help format (.hlp) on all Windows platforms in the future. Compressed +# HTML files also contain an index, a table of contents, and you can search for +# words in the documentation. The HTML workshop also contains a viewer for +# compressed HTML files. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +GENERATE_HTMLHELP = NO + +# The CHM_FILE tag can be used to specify the file name of the resulting .chm +# file. You can add a path in front of the file if the result should not be +# written to the html output directory. +# This tag requires that the tag GENERATE_HTMLHELP is set to YES. + +CHM_FILE = + +# The HHC_LOCATION tag can be used to specify the location (absolute path +# including file name) of the HTML help compiler (hhc.exe). If non-empty, +# doxygen will try to run the HTML help compiler on the generated index.hhp. +# The file has to be specified with full path. +# This tag requires that the tag GENERATE_HTMLHELP is set to YES. + +HHC_LOCATION = + +# The GENERATE_CHI flag controls if a separate .chi index file is generated +# (YES) or that it should be included in the master .chm file (NO). +# The default value is: NO. +# This tag requires that the tag GENERATE_HTMLHELP is set to YES. + +GENERATE_CHI = NO + +# The CHM_INDEX_ENCODING is used to encode HtmlHelp index (hhk), content (hhc) +# and project file content. +# This tag requires that the tag GENERATE_HTMLHELP is set to YES. + +CHM_INDEX_ENCODING = + +# The BINARY_TOC flag controls whether a binary table of contents is generated +# (YES) or a normal table of contents (NO) in the .chm file. Furthermore it +# enables the Previous and Next buttons. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTMLHELP is set to YES. + +BINARY_TOC = NO + +# The TOC_EXPAND flag can be set to YES to add extra items for group members to +# the table of contents of the HTML help documentation and to the tree view. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTMLHELP is set to YES. + +TOC_EXPAND = NO + +# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and +# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that +# can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help +# (.qch) of the generated HTML documentation. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +GENERATE_QHP = NO + +# If the QHG_LOCATION tag is specified, the QCH_FILE tag can be used to specify +# the file name of the resulting .qch file. The path specified is relative to +# the HTML output folder. +# This tag requires that the tag GENERATE_QHP is set to YES. + +QCH_FILE = + +# The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help +# Project output. For more information please see Qt Help Project / Namespace +# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace). +# The default value is: org.doxygen.Project. +# This tag requires that the tag GENERATE_QHP is set to YES. + +QHP_NAMESPACE = org.doxygen.Project + +# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt +# Help Project output. For more information please see Qt Help Project / Virtual +# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual- +# folders). +# The default value is: doc. +# This tag requires that the tag GENERATE_QHP is set to YES. + +QHP_VIRTUAL_FOLDER = doc + +# If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom +# filter to add. For more information please see Qt Help Project / Custom +# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- +# filters). +# This tag requires that the tag GENERATE_QHP is set to YES. + +QHP_CUST_FILTER_NAME = + +# The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the +# custom filter to add. For more information please see Qt Help Project / Custom +# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- +# filters). +# This tag requires that the tag GENERATE_QHP is set to YES. + +QHP_CUST_FILTER_ATTRS = + +# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this +# project's filter section matches. Qt Help Project / Filter Attributes (see: +# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes). +# This tag requires that the tag GENERATE_QHP is set to YES. + +QHP_SECT_FILTER_ATTRS = + +# The QHG_LOCATION tag can be used to specify the location of Qt's +# qhelpgenerator. If non-empty doxygen will try to run qhelpgenerator on the +# generated .qhp file. +# This tag requires that the tag GENERATE_QHP is set to YES. + +QHG_LOCATION = + +# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be +# generated, together with the HTML files, they form an Eclipse help plugin. To +# install this plugin and make it available under the help contents menu in +# Eclipse, the contents of the directory containing the HTML and XML files needs +# to be copied into the plugins directory of eclipse. The name of the directory +# within the plugins directory should be the same as the ECLIPSE_DOC_ID value. +# After copying Eclipse needs to be restarted before the help appears. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +GENERATE_ECLIPSEHELP = NO + +# A unique identifier for the Eclipse help plugin. When installing the plugin +# the directory name containing the HTML and XML files should also have this +# name. Each documentation set should have its own identifier. +# The default value is: org.doxygen.Project. +# This tag requires that the tag GENERATE_ECLIPSEHELP is set to YES. + +ECLIPSE_DOC_ID = org.doxygen.Project + +# If you want full control over the layout of the generated HTML pages it might +# be necessary to disable the index and replace it with your own. The +# DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) at top +# of each HTML page. A value of NO enables the index and the value YES disables +# it. Since the tabs in the index contain the same information as the navigation +# tree, you can set this option to YES if you also set GENERATE_TREEVIEW to YES. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +DISABLE_INDEX = NO + +# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index +# structure should be generated to display hierarchical information. If the tag +# value is set to YES, a side panel will be generated containing a tree-like +# index structure (just like the one that is generated for HTML Help). For this +# to work a browser that supports JavaScript, DHTML, CSS and frames is required +# (i.e. any modern browser). Windows users are probably better off using the +# HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can +# further fine-tune the look of the index. As an example, the default style +# sheet generated by doxygen has an example that shows how to put an image at +# the root of the tree instead of the PROJECT_NAME. Since the tree basically has +# the same information as the tab index, you could consider setting +# DISABLE_INDEX to YES when enabling this option. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +GENERATE_TREEVIEW = NO + +# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that +# doxygen will group on one line in the generated HTML documentation. +# +# Note that a value of 0 will completely suppress the enum values from appearing +# in the overview section. +# Minimum value: 0, maximum value: 20, default value: 4. +# This tag requires that the tag GENERATE_HTML is set to YES. + +ENUM_VALUES_PER_LINE = 4 + +# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be used +# to set the initial width (in pixels) of the frame in which the tree is shown. +# Minimum value: 0, maximum value: 1500, default value: 250. +# This tag requires that the tag GENERATE_HTML is set to YES. + +TREEVIEW_WIDTH = 250 + +# If the EXT_LINKS_IN_WINDOW option is set to YES, doxygen will open links to +# external symbols imported via tag files in a separate window. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +EXT_LINKS_IN_WINDOW = NO + +# Use this tag to change the font size of LaTeX formulas included as images in +# the HTML documentation. When you change the font size after a successful +# doxygen run you need to manually remove any form_*.png images from the HTML +# output directory to force them to be regenerated. +# Minimum value: 8, maximum value: 50, default value: 10. +# This tag requires that the tag GENERATE_HTML is set to YES. + +FORMULA_FONTSIZE = 10 + +# Use the FORMULA_TRANPARENT tag to determine whether or not the images +# generated for formulas are transparent PNGs. Transparent PNGs are not +# supported properly for IE 6.0, but are supported on all modern browsers. +# +# Note that when changing this option you need to delete any form_*.png files in +# the HTML output directory before the changes have effect. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +FORMULA_TRANSPARENT = YES + +# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see +# http://www.mathjax.org) which uses client side Javascript for the rendering +# instead of using pre-rendered bitmaps. Use this if you do not have LaTeX +# installed or if you want to formulas look prettier in the HTML output. When +# enabled you may also need to install MathJax separately and configure the path +# to it using the MATHJAX_RELPATH option. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +USE_MATHJAX = NO + +# When MathJax is enabled you can set the default output format to be used for +# the MathJax output. See the MathJax site (see: +# http://docs.mathjax.org/en/latest/output.html) for more details. +# Possible values are: HTML-CSS (which is slower, but has the best +# compatibility), NativeMML (i.e. MathML) and SVG. +# The default value is: HTML-CSS. +# This tag requires that the tag USE_MATHJAX is set to YES. + +MATHJAX_FORMAT = HTML-CSS + +# When MathJax is enabled you need to specify the location relative to the HTML +# output directory using the MATHJAX_RELPATH option. The destination directory +# should contain the MathJax.js script. For instance, if the mathjax directory +# is located at the same level as the HTML output directory, then +# MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax +# Content Delivery Network so you can quickly see the result without installing +# MathJax. However, it is strongly recommended to install a local copy of +# MathJax from http://www.mathjax.org before deployment. +# The default value is: http://cdn.mathjax.org/mathjax/latest. +# This tag requires that the tag USE_MATHJAX is set to YES. + +MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest + +# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax +# extension names that should be enabled during MathJax rendering. For example +# MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols +# This tag requires that the tag USE_MATHJAX is set to YES. + +MATHJAX_EXTENSIONS = + +# The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces +# of code that will be used on startup of the MathJax code. See the MathJax site +# (see: http://docs.mathjax.org/en/latest/output.html) for more details. For an +# example see the documentation. +# This tag requires that the tag USE_MATHJAX is set to YES. + +MATHJAX_CODEFILE = + +# When the SEARCHENGINE tag is enabled doxygen will generate a search box for +# the HTML output. The underlying search engine uses javascript and DHTML and +# should work on any modern browser. Note that when using HTML help +# (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET) +# there is already a search function so this one should typically be disabled. +# For large projects the javascript based search engine can be slow, then +# enabling SERVER_BASED_SEARCH may provide a better solution. It is possible to +# search using the keyboard; to jump to the search box use + S +# (what the is depends on the OS and browser, but it is typically +# , /