From 141ac4b01adf9867a5de87cab04e2876bffb21d3 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sun, 11 Aug 2013 13:32:58 -0500 Subject: [PATCH] Resolve inspection issues. --- doc/html/docutils.css | 275 -------------------------- doc/html/minimal.css | 23 --- doc/html/reference.css | 11 -- include/boost/predef/version_number.h | 2 +- test/info_as_c.c | 92 ++++----- test/info_as_cpp.cpp | 126 ++++++------ test/make.cpp | 112 +++++------ test/version.cpp | 68 +++---- 8 files changed, 200 insertions(+), 509 deletions(-) delete mode 100644 doc/html/docutils.css delete mode 100644 doc/html/minimal.css delete mode 100644 doc/html/reference.css diff --git a/doc/html/docutils.css b/doc/html/docutils.css deleted file mode 100644 index 4aa2e21..0000000 --- a/doc/html/docutils.css +++ /dev/null @@ -1,275 +0,0 @@ -/* -:Author: David Goodger -:Contact: goodger@python.org -:Date: $Date: 2007-04-16 23:44:59 -0500 (Mon, 16 Apr 2007) $ -:Revision: $Revision: 37457 $ -:Copyright: This stylesheet has been placed in the public domain. - -Default cascading style sheet for the HTML output of Docutils. - -See http://docutils.sf.net/docs/howto/html-stylesheets.html for how to -customize this style sheet. -*/ - -/* used to remove borders from tables and images */ -.borderless, table.borderless td, table.borderless th { - border: 0 } - -table.borderless td, table.borderless th { - /* Override padding for "table.docutils td" with "! important". - The right padding separates the table cells. */ - padding: 0 0.5em 0 0 ! important } - -.first { - /* Override more specific margin styles with "! important". */ - margin-top: 0 ! important } - -.last, .with-subtitle { - margin-bottom: 0 ! important } - -.hidden { - display: none } - -a.toc-backref { - text-decoration: none ; - color: black } - -blockquote.epigraph { - margin: 2em 5em ; } - -dl.docutils dd { - margin-bottom: 0.5em } - -/* Uncomment (and remove this text!) to get bold-faced definition list terms -dl.docutils dt { - font-weight: bold } -*/ - -div.abstract { - margin: 2em 5em } - -div.abstract p.topic-title { - font-weight: bold ; - text-align: center } - -div.admonition, div.attention, div.caution, div.danger, div.error, -div.hint, div.important, div.note, div.tip, div.warning { - margin: 2em ; - border: medium outset ; - padding: 1em } - -div.admonition p.admonition-title, div.hint p.admonition-title, -div.important p.admonition-title, div.note p.admonition-title, -div.tip p.admonition-title { - font-weight: bold ; - font-family: sans-serif } - -div.attention p.admonition-title, div.caution p.admonition-title, -div.danger p.admonition-title, div.error p.admonition-title, -div.warning p.admonition-title { - color: red ; - font-weight: bold ; - font-family: sans-serif } - -/* Uncomment (and remove this text!) to get reduced vertical space in - compound paragraphs. -div.compound .compound-first, div.compound .compound-middle { - margin-bottom: 0.5em } - -div.compound .compound-last, div.compound .compound-middle { - margin-top: 0.5em } -*/ - -div.dedication { - margin: 2em 5em ; - text-align: center ; - font-style: italic } - -div.dedication p.topic-title { - font-weight: bold ; - font-style: normal } - -div.figure { - margin-left: 2em ; - margin-right: 2em } - -div.footer, div.header { - clear: both; - font-size: smaller } - -div.line-block { - display: block ; - margin-top: 1em ; - margin-bottom: 1em } - -div.line-block div.line-block { - margin-top: 0 ; - margin-bottom: 0 ; - margin-left: 1.5em } - -div.sidebar { - margin-left: 1em ; - border: medium outset ; - padding: 1em ; - background-color: #ffffee ; - width: 40% ; - float: right ; - clear: right } - -div.sidebar p.rubric { - font-family: sans-serif ; - font-size: medium } - -div.system-messages { - margin: 5em } - -div.system-messages h1 { - color: red } - -div.system-message { - border: medium outset ; - padding: 1em } - -div.system-message p.system-message-title { - color: red ; - font-weight: bold } - -div.topic { - margin: 2em } - -h1.section-subtitle, h2.section-subtitle, h3.section-subtitle, -h4.section-subtitle, h5.section-subtitle, h6.section-subtitle { - margin-top: 0.4em } - -h1.title { - text-align: center } - -h2.subtitle { - text-align: center } - -hr.docutils { - width: 75% } - -img.align-left { - clear: left } - -img.align-right { - clear: right } - -ol.simple, ul.simple { - margin-bottom: 1em } - -ol.arabic { - list-style: decimal } - -ol.loweralpha { - list-style: lower-alpha } - -ol.upperalpha { - list-style: upper-alpha } - -ol.lowerroman { - list-style: lower-roman } - -ol.upperroman { - list-style: upper-roman } - -p.attribution { - text-align: right ; - margin-left: 50% } - -p.caption { - font-style: italic } - -p.credits { - font-style: italic ; - font-size: smaller } - -p.label { - white-space: nowrap } - -p.rubric { - font-weight: bold ; - font-size: larger ; - color: maroon ; - text-align: center } - -p.sidebar-title { - font-family: sans-serif ; - font-weight: bold ; - font-size: larger } - -p.sidebar-subtitle { - font-family: sans-serif ; - font-weight: bold } - -p.topic-title { - font-weight: bold } - -pre.address { - margin-bottom: 0 ; - margin-top: 0 ; - font-family: serif ; - font-size: 100% } - -pre.literal-block, pre.doctest-block { - margin-left: 2em ; - margin-right: 2em } - -span.classifier { - font-family: sans-serif ; - font-style: oblique } - -span.classifier-delimiter { - font-family: sans-serif ; - font-weight: bold } - -span.interpreted { - font-family: sans-serif } - -span.option { - white-space: nowrap } - -span.pre { - white-space: pre } - -span.problematic { - color: red } - -span.section-subtitle { - /* font-size relative to parent (h1..h6 element) */ - font-size: 80% } - -table.citation { - border-left: solid 1px gray; - margin-left: 1px } - -table.docinfo { - margin: 2em 4em } - -table.docutils { - margin-top: 0.5em ; - margin-bottom: 0.5em } - -table.footnote { - border-left: solid 1px black; - margin-left: 1px } - -table.docutils td, table.docutils th, -table.docinfo td, table.docinfo th { - padding-left: 0.5em ; - padding-right: 0.5em ; - vertical-align: top } - -table.docutils th.field-name, table.docinfo th.docinfo-name { - font-weight: bold ; - text-align: left ; - white-space: nowrap ; - padding-left: 0 } - -h1 tt.docutils, h2 tt.docutils, h3 tt.docutils, -h4 tt.docutils, h5 tt.docutils, h6 tt.docutils { - font-size: 100% } - -ul.auto-toc { - list-style-type: none } diff --git a/doc/html/minimal.css b/doc/html/minimal.css deleted file mode 100644 index 76d1031..0000000 --- a/doc/html/minimal.css +++ /dev/null @@ -1,23 +0,0 @@ -/* - - © Copyright Beman Dawes, 2007 - - Distributed under the Boost Software License, Version 1.0. - See www.boost.org/LICENSE_1_0.txt - -*/ - -body { - font-family: sans-serif; - margin: 1em; - max-width : 8.5in; - } - -table { margin: 0.5em; } - -pre { background-color:#D7EEFF } - -ins { background-color:#A0FFA0 } -del { background-color:#FFA0A0 } - -/*** end ***/ \ No newline at end of file diff --git a/doc/html/reference.css b/doc/html/reference.css deleted file mode 100644 index 6826962..0000000 --- a/doc/html/reference.css +++ /dev/null @@ -1,11 +0,0 @@ -/*============================================================================ - Copyright 2003-2004 Douglas Gregor - Distributed under the Boost Software License, Version 1.0. (See accompany- - ing file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -============================================================================*/ - -PRE.synopsis { - background-color: #e0ffff; - border: thin solid blue; - padding: 1em -} \ No newline at end of file diff --git a/include/boost/predef/version_number.h b/include/boost/predef/version_number.h index 5836cfa..2ecccd2 100644 --- a/include/boost/predef/version_number.h +++ b/include/boost/predef/version_number.h @@ -49,6 +49,6 @@ Defines standard version numbers, with these properties: BOOST_VERSION_NUMBER_MIN #define BOOST_VERSION_NUMBER_NOT_AVAILABLE \ - BOOST_VERSION_NUMBER_ZERO + BOOST_VERSION_NUMBER_ZERO #endif diff --git a/test/info_as_c.c b/test/info_as_c.c index 15bc79f..c6e8078 100644 --- a/test/info_as_c.c +++ b/test/info_as_c.c @@ -12,65 +12,65 @@ http://www.boost.org/LICENSE_1_0.txt) typedef struct predef_info { - unsigned tag; - char * name; - char * description; - unsigned value; + unsigned tag; + char * name; + char * description; + unsigned value; } predef_info; predef_info first_predef_info = { 0x43210DEF , "-" , "-" , 0xFFFFFFFF }; #define BOOST_PREDEF_DECLARE_TEST(x,s) \ - predef_info x##_predef_info = { 0x67890DEF , #x , s , x }; + predef_info x##_predef_info = { 0x67890DEF , #x , s , x }; #include predef_info last_predef_info = { 0xFFFFFFFF , "-" , "-" , 0x43210DEF }; int predef_info_compare(const void * a, const void * b) { - const predef_info ** i = (const predef_info **)a; - const predef_info ** j = (const predef_info **)b; - return strcmp((*i)->name,(*j)->name); + const predef_info ** i = (const predef_info **)a; + const predef_info ** j = (const predef_info **)b; + return strcmp((*i)->name,(*j)->name); } int main() { - unsigned x = 0; - predef_info ** predefs = 0; - unsigned predef_count = 0; - unsigned * i = &first_predef_info.tag; - unsigned * e = &last_predef_info.tag; - while (i < e) - { - i += 1; - if (*i == 0x67890DEF) - { - predef_count += 1; - predefs = realloc(predefs,predef_count*sizeof(predef_info*)); - predefs[predef_count-1] = (predef_info*)i; - } - } - qsort(predefs,predef_count,sizeof(predef_info*),predef_info_compare); - puts("** Detected **"); - for (x = 0; x < predef_count; ++x) - { - if (predefs[x]->value > 0) - printf("%s = %u (%u,%u,%u) | %s\n", - predefs[x]->name, - predefs[x]->value, - (predefs[x]->value/10000000)%100, - (predefs[x]->value/100000)%100, - (predefs[x]->value)%100000, - predefs[x]->description); - } - puts("** Not Detected **"); - for (x = 0; x < predef_count; ++x) - { - if (predefs[x]->value == 0) - printf("%s = %u | %s\n", - predefs[x]->name, - predefs[x]->value, - predefs[x]->description); - } - return 0; + unsigned x = 0; + predef_info ** predefs = 0; + unsigned predef_count = 0; + unsigned * i = &first_predef_info.tag; + unsigned * e = &last_predef_info.tag; + while (i < e) + { + i += 1; + if (*i == 0x67890DEF) + { + predef_count += 1; + predefs = realloc(predefs,predef_count*sizeof(predef_info*)); + predefs[predef_count-1] = (predef_info*)i; + } + } + qsort(predefs,predef_count,sizeof(predef_info*),predef_info_compare); + puts("** Detected **"); + for (x = 0; x < predef_count; ++x) + { + if (predefs[x]->value > 0) + printf("%s = %u (%u,%u,%u) | %s\n", + predefs[x]->name, + predefs[x]->value, + (predefs[x]->value/10000000)%100, + (predefs[x]->value/100000)%100, + (predefs[x]->value)%100000, + predefs[x]->description); + } + puts("** Not Detected **"); + for (x = 0; x < predef_count; ++x) + { + if (predefs[x]->value == 0) + printf("%s = %u | %s\n", + predefs[x]->name, + predefs[x]->value, + predefs[x]->description); + } + return 0; } diff --git a/test/info_as_cpp.cpp b/test/info_as_cpp.cpp index c63def2..92245ad 100644 --- a/test/info_as_cpp.cpp +++ b/test/info_as_cpp.cpp @@ -12,79 +12,79 @@ http://www.boost.org/LICENSE_1_0.txt) namespace { - struct predef_info - { - std::string name; - std::string description; - unsigned value; + struct predef_info + { + std::string name; + std::string description; + unsigned value; - predef_info( - std::string const & n, - std::string const & d, - unsigned v); + predef_info( + std::string const & n, + std::string const & d, + unsigned v); - predef_info( - predef_info const & other) - : name(other.name) - , description(other.description) - , value(other.value) - { - } + predef_info( + predef_info const & other) + : name(other.name) + , description(other.description) + , value(other.value) + { + } - bool operator < (predef_info const & other) const - { - return name < other.name; - } - }; + bool operator < (predef_info const & other) const + { + return name < other.name; + } + }; - std::set * predefs = 0; + std::set * predefs = 0; - predef_info::predef_info( - std::string const & n, - std::string const & d, - unsigned v) - : name(n) - , description(d) - , value(v) - { - if (!predefs) - { - predefs = new std::set(); - } - predefs->insert(*this); - } + predef_info::predef_info( + std::string const & n, + std::string const & d, + unsigned v) + : name(n) + , description(d) + , value(v) + { + if (!predefs) + { + predefs = new std::set(); + } + predefs->insert(*this); + } } #define BOOST_PREDEF_DECLARE_TEST(x,s) \ - namespace { \ - predef_info x##_predef_init(#x,s,x); \ - } + namespace { \ + predef_info x##_predef_init(#x,s,x); \ + } #include int main() { - std::set::iterator i; - std::set::iterator e = predefs->end(); - std::cout << "** Detected **" << std::endl; - for (i = predefs->begin(); i != e; ++i) - { - if (i->value > 0) - std::cout - << i->name << " = " - << i->value - << " (" << (i->value/10000000)%100 << "," << (i->value/100000)%100 << "," << (i->value)%100000 << ") | " - << i->description - << std::endl; - } - std::cout << "** Not Detected **" << std::endl; - for (i = predefs->begin(); i != e; ++i) - { - if (i->value == 0) - std::cout - << i->name << " = " - << i->value << " | " - << i->description - << std::endl; - } - return 0; + std::set::iterator i; + std::set::iterator e = predefs->end(); + std::cout << "** Detected **" << std::endl; + for (i = predefs->begin(); i != e; ++i) + { + if (i->value > 0) + std::cout + << i->name << " = " + << i->value + << " (" << (i->value/10000000)%100 << "," << (i->value/100000)%100 << "," << (i->value)%100000 << ") | " + << i->description + << std::endl; + } + std::cout << "** Not Detected **" << std::endl; + for (i = predefs->begin(); i != e; ++i) + { + if (i->value == 0) + std::cout + << i->name << " = " + << i->value << " | " + << i->description + << std::endl; + } + return 0; } diff --git a/test/make.cpp b/test/make.cpp index bec6657..9665020 100644 --- a/test/make.cpp +++ b/test/make.cpp @@ -13,75 +13,75 @@ http://www.boost.org/LICENSE_1_0.txt) namespace { - struct test_info - { - std::string value; - bool passed; + struct test_info + { + std::string value; + bool passed; - test_info(std::string const & v, bool p) : value(v), passed(p) {} - test_info(test_info const & o) : value(o.value), passed(o.passed) {} - }; + test_info(std::string const & v, bool p) : value(v), passed(p) {} + test_info(test_info const & o) : value(o.value), passed(o.passed) {} + }; - std::vector test_results; + std::vector test_results; } #define PREDEF_CHECK(X) test_results.push_back(test_info(#X,(X))) void test_BOOST_VERSION_NUMBER() { - PREDEF_CHECK(BOOST_PREDEF_MAKE_0X_VRP(0xFFF) == BOOST_VERSION_NUMBER(0xF,0xF,0xF)); - PREDEF_CHECK(BOOST_PREDEF_MAKE_0X_VVRP(0xFFFF) == BOOST_VERSION_NUMBER(0xFF,0xF,0xF)); - PREDEF_CHECK(BOOST_PREDEF_MAKE_0X_VRPP(0xFFFF) == BOOST_VERSION_NUMBER(0xF,0xF,0xFF)); - PREDEF_CHECK(BOOST_PREDEF_MAKE_0X_VVRR(0xFFFF) == BOOST_VERSION_NUMBER(0xFF,0xFF,0x0)); - PREDEF_CHECK(BOOST_PREDEF_MAKE_0X_VRRPPPP(0xFFFFFFF) == BOOST_VERSION_NUMBER(0xF,0xFF,0xFFFF)); - PREDEF_CHECK(BOOST_PREDEF_MAKE_0X_VVRRP(0xFFFFF) == BOOST_VERSION_NUMBER(0xFF,0xFF,0xF)); - PREDEF_CHECK(BOOST_PREDEF_MAKE_0X_VRRPP000(0xFFFFF000) == BOOST_VERSION_NUMBER(0xF,0xFF,0xFF)); + PREDEF_CHECK(BOOST_PREDEF_MAKE_0X_VRP(0xFFF) == BOOST_VERSION_NUMBER(0xF,0xF,0xF)); + PREDEF_CHECK(BOOST_PREDEF_MAKE_0X_VVRP(0xFFFF) == BOOST_VERSION_NUMBER(0xFF,0xF,0xF)); + PREDEF_CHECK(BOOST_PREDEF_MAKE_0X_VRPP(0xFFFF) == BOOST_VERSION_NUMBER(0xF,0xF,0xFF)); + PREDEF_CHECK(BOOST_PREDEF_MAKE_0X_VVRR(0xFFFF) == BOOST_VERSION_NUMBER(0xFF,0xFF,0x0)); + PREDEF_CHECK(BOOST_PREDEF_MAKE_0X_VRRPPPP(0xFFFFFFF) == BOOST_VERSION_NUMBER(0xF,0xFF,0xFFFF)); + PREDEF_CHECK(BOOST_PREDEF_MAKE_0X_VVRRP(0xFFFFF) == BOOST_VERSION_NUMBER(0xFF,0xFF,0xF)); + PREDEF_CHECK(BOOST_PREDEF_MAKE_0X_VRRPP000(0xFFFFF000) == BOOST_VERSION_NUMBER(0xF,0xFF,0xFF)); - PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VRP(999) == BOOST_VERSION_NUMBER(9,9,9)); - PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VPPP(9999) == BOOST_VERSION_NUMBER(9,0,999)); - PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VVRRPP(999999) == BOOST_VERSION_NUMBER(99,99,99)); - PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VVRR(9999) == BOOST_VERSION_NUMBER(99,99,0)); - PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VRPP(9999) == BOOST_VERSION_NUMBER(9,9,99)); - PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VRRPP(99999) == BOOST_VERSION_NUMBER(9,99,99)); - PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VRP000(999000) == BOOST_VERSION_NUMBER(9,9,9)); - PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VRR000(999000) == BOOST_VERSION_NUMBER(9,99,0)); - PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VVRR00PP00(2199009900) == BOOST_VERSION_NUMBER(21,99,99)); - PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VVRR00PP00(9999009900L) == BOOST_VERSION_NUMBER(99,99,99)); - PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VVRR0PP00(999909900) == BOOST_VERSION_NUMBER(99,99,99)); - PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VV00(9900) == BOOST_VERSION_NUMBER(99,00,00)); - PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VVRR0PPPP(999909999) == BOOST_VERSION_NUMBER(99,99,9999)); - PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VRR(999) == BOOST_VERSION_NUMBER(9,99,00)); + PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VRP(999) == BOOST_VERSION_NUMBER(9,9,9)); + PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VPPP(9999) == BOOST_VERSION_NUMBER(9,0,999)); + PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VVRRPP(999999) == BOOST_VERSION_NUMBER(99,99,99)); + PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VVRR(9999) == BOOST_VERSION_NUMBER(99,99,0)); + PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VRPP(9999) == BOOST_VERSION_NUMBER(9,9,99)); + PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VRRPP(99999) == BOOST_VERSION_NUMBER(9,99,99)); + PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VRP000(999000) == BOOST_VERSION_NUMBER(9,9,9)); + PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VRR000(999000) == BOOST_VERSION_NUMBER(9,99,0)); + PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VVRR00PP00(2199009900) == BOOST_VERSION_NUMBER(21,99,99)); + PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VVRR00PP00(9999009900L) == BOOST_VERSION_NUMBER(99,99,99)); + PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VVRR0PP00(999909900) == BOOST_VERSION_NUMBER(99,99,99)); + PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VV00(9900) == BOOST_VERSION_NUMBER(99,00,00)); + PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VVRR0PPPP(999909999) == BOOST_VERSION_NUMBER(99,99,9999)); + PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VRR(999) == BOOST_VERSION_NUMBER(9,99,00)); - PREDEF_CHECK(BOOST_PREDEF_MAKE_DATE(1971,1,1) == BOOST_VERSION_NUMBER(1,1,1)); - PREDEF_CHECK(BOOST_PREDEF_MAKE_YYYYMMDD(19700101) == BOOST_VERSION_NUMBER(0,1,1)); - PREDEF_CHECK(BOOST_PREDEF_MAKE_YYYYMMDD(19710101) == BOOST_VERSION_NUMBER(1,1,1)); - PREDEF_CHECK(BOOST_PREDEF_MAKE_YYYYMMDD(20691231) == BOOST_VERSION_NUMBER(99,12,31)); - PREDEF_CHECK(BOOST_PREDEF_MAKE_YYYYMM(197001) == BOOST_VERSION_NUMBER(0,1,1)); - PREDEF_CHECK(BOOST_PREDEF_MAKE_YYYYMM(197101) == BOOST_VERSION_NUMBER(1,1,1)); - PREDEF_CHECK(BOOST_PREDEF_MAKE_YYYYMM(206912) == BOOST_VERSION_NUMBER(99,12,1)); + PREDEF_CHECK(BOOST_PREDEF_MAKE_DATE(1971,1,1) == BOOST_VERSION_NUMBER(1,1,1)); + PREDEF_CHECK(BOOST_PREDEF_MAKE_YYYYMMDD(19700101) == BOOST_VERSION_NUMBER(0,1,1)); + PREDEF_CHECK(BOOST_PREDEF_MAKE_YYYYMMDD(19710101) == BOOST_VERSION_NUMBER(1,1,1)); + PREDEF_CHECK(BOOST_PREDEF_MAKE_YYYYMMDD(20691231) == BOOST_VERSION_NUMBER(99,12,31)); + PREDEF_CHECK(BOOST_PREDEF_MAKE_YYYYMM(197001) == BOOST_VERSION_NUMBER(0,1,1)); + PREDEF_CHECK(BOOST_PREDEF_MAKE_YYYYMM(197101) == BOOST_VERSION_NUMBER(1,1,1)); + PREDEF_CHECK(BOOST_PREDEF_MAKE_YYYYMM(206912) == BOOST_VERSION_NUMBER(99,12,1)); } int main() { - test_BOOST_VERSION_NUMBER(); + test_BOOST_VERSION_NUMBER(); - unsigned fail_count = 0; - std::vector::iterator i = test_results.begin(); - std::vector::iterator e = test_results.end(); - for (; i != e; ++i) - { - std::cout - << (i->passed ? "[passed]" : "[failed]") - << " " << i->value - << std::endl; - fail_count += i->passed ? 0 : 1; - } - std::cout - << std::endl - << "TOTAL: " - << "passed " << (test_results.size()-fail_count) << ", " - << "failed " << (fail_count) << ", " - << "of " << (test_results.size()) - << std::endl; - return fail_count; + unsigned fail_count = 0; + std::vector::iterator i = test_results.begin(); + std::vector::iterator e = test_results.end(); + for (; i != e; ++i) + { + std::cout + << (i->passed ? "[passed]" : "[failed]") + << " " << i->value + << std::endl; + fail_count += i->passed ? 0 : 1; + } + std::cout + << std::endl + << "TOTAL: " + << "passed " << (test_results.size()-fail_count) << ", " + << "failed " << (fail_count) << ", " + << "of " << (test_results.size()) + << std::endl; + return fail_count; } diff --git a/test/version.cpp b/test/version.cpp index 747399a..713ab48 100644 --- a/test/version.cpp +++ b/test/version.cpp @@ -12,51 +12,51 @@ http://www.boost.org/LICENSE_1_0.txt) namespace { - struct test_info - { - std::string value; - bool passed; + struct test_info + { + std::string value; + bool passed; - test_info(std::string const & v, bool p) : value(v), passed(p) {} - test_info(test_info const & o) : value(o.value), passed(o.passed) {} - }; + test_info(std::string const & v, bool p) : value(v), passed(p) {} + test_info(test_info const & o) : value(o.value), passed(o.passed) {} + }; - std::vector test_results; + std::vector test_results; } #define PREDEF_CHECK(X) test_results.push_back(test_info(#X,(X))) void test_BOOST_VERSION_NUMBER() { - PREDEF_CHECK(BOOST_VERSION_NUMBER(0,0,1) == 1L); - PREDEF_CHECK(BOOST_VERSION_NUMBER(99,99,99999) == 999999999L); - PREDEF_CHECK(BOOST_VERSION_NUMBER(299,99,99999) != 2999999999L); - PREDEF_CHECK(BOOST_VERSION_NUMBER(100,99,99999) != 1009999999L); - PREDEF_CHECK(BOOST_VERSION_NUMBER(100,99,99999) == 9999999L); - PREDEF_CHECK(BOOST_VERSION_NUMBER(100,100,100000) == 0L); + PREDEF_CHECK(BOOST_VERSION_NUMBER(0,0,1) == 1L); + PREDEF_CHECK(BOOST_VERSION_NUMBER(99,99,99999) == 999999999L); + PREDEF_CHECK(BOOST_VERSION_NUMBER(299,99,99999) != 2999999999L); + PREDEF_CHECK(BOOST_VERSION_NUMBER(100,99,99999) != 1009999999L); + PREDEF_CHECK(BOOST_VERSION_NUMBER(100,99,99999) == 9999999L); + PREDEF_CHECK(BOOST_VERSION_NUMBER(100,100,100000) == 0L); } int main() { - test_BOOST_VERSION_NUMBER(); + test_BOOST_VERSION_NUMBER(); - unsigned fail_count = 0; - std::vector::iterator i = test_results.begin(); - std::vector::iterator e = test_results.end(); - for (; i != e; ++i) - { - std::cout - << (i->passed ? "[passed]" : "[failed]") - << " " << i->value - << std::endl; - fail_count += i->passed ? 0 : 1; - } - std::cout - << std::endl - << "TOTAL: " - << "passed " << (test_results.size()-fail_count) << ", " - << "failed " << (fail_count) << ", " - << "of " << (test_results.size()) - << std::endl; - return fail_count; + unsigned fail_count = 0; + std::vector::iterator i = test_results.begin(); + std::vector::iterator e = test_results.end(); + for (; i != e; ++i) + { + std::cout + << (i->passed ? "[passed]" : "[failed]") + << " " << i->value + << std::endl; + fail_count += i->passed ? 0 : 1; + } + std::cout + << std::endl + << "TOTAL: " + << "passed " << (test_results.size()-fail_count) << ", " + << "failed " << (fail_count) << ", " + << "of " << (test_results.size()) + << std::endl; + return fail_count; }