diff --git a/config/has_is_constant_evaluated.cpp b/config/has_is_constant_evaluated.cpp index 4dac95b2..d6a011f1 100644 --- a/config/has_is_constant_evaluated.cpp +++ b/config/has_is_constant_evaluated.cpp @@ -38,10 +38,6 @@ BOOST_PRAGMA_MESSAGE ("BOOST_MP_HAS_IS_CONSTANT_EVALUATED is NOT defined, so no BOOST_PRAGMA_MESSAGE ("BOOST_NO_CXX14_CONSTEXPR is defined.") #endif -#ifdef BOOST_NO_CXX17_CONSTEXPR -BOOST_PRAGMA_MESSAGE ("BOOST_NO_CXX17_CONSTEXPR is defined.") -#endif - #ifdef BOOST_MP_NO_CONSTEXPR_DETECTION # error 1 "std::is_constant_evaluated is NOT available to determine if a calculation can use constexpr." #endif diff --git a/doc/html/multiprecision.css b/doc/html/multiprecision.css index 6b076046..6d009808 100644 --- a/doc/html/multiprecision.css +++ b/doc/html/multiprecision.css @@ -1,7 +1,5 @@ @import url('../../../../doc/src/boostbook.css'); -/* Contains the basic settings for BoostBook and used by Quickbook to docbook conversion. */ - -/* Note:this import link assumes called from doc/html, not from any backup copy in /doc. */ +/* Contains the basic settings for BoostBook and used by Quickbook to docbook conversion. */ /*============================================================================= Copyright (c) 2004 Joel de Guzman http://spirit.sourceforge.net/ @@ -18,10 +16,14 @@ ing file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) Visual Studio is recommended for editing this file because it checks syntax, does layout and provides help on options. - - boost-no-inspect to avoid error message from inspect.exe - doc\multiprecision.css: Unlinked file - (line 1) Broken link: ../../../../doc/src/boostbook.css + +IMPORTANT: there are two versions of this file - + +one in libs/math/doc and one in libs/math/doc/html + +ONLY EVER EDIT THE FIRST OF THESE !!!! + +=============================================================================*/ /*============================================================================= Program listings @@ -40,22 +42,15 @@ Program listings padding: 0.5pc 0.5pc 0.5pc 0.5pc; } -.programlisting, -.screen { - font-size: 10pt; - display: block; - /* was margin: 1pc 4% 0pc 4%; - but that led to overflow on some code lines, so reduced and lined up with blockquote indent (see below). */ - margin: 1pc 2% 0pc 2%; - /* https://www.w3schools.com/Css/css_margin.asp margin-top margin-right margin-bottom margin-left. - * auto - the browser calculates the margin - * length - specifies a margin in px, pt, cm, etc. - * % - specifies a margin in % of the width of the containing element - * inherit - specifies that the margin should be inherited from the parent element - - */ - padding: 0.5pc 0.5pc 0.5pc 0.5pc; -} + .programlisting, + .screen + { + font-size: 10pt; + display: block; + /* was margin: 1pc 4% 0pc 4%; */ + margin: 1pc 2% 0pc 2%; + padding: 0.5pc 0.5pc 0.5pc 0.5pc; + } @media screen { /* Syntax Highlighting */ @@ -131,20 +126,24 @@ span.alignjustify Names at http://www.w3.org/TR/2002/WD-css3-color-20020219/ 4.3. X11 color keywords. Quickbook Usage: [role red Some red text] +inline-block - Flows a element inline with the text, but allows width and height to be specified. + +https://stackoverflow.com/questions/3043021/is-there-any-guide-on-when-to-use-displayblock-when-inline-and-when-inline-b#:~:text=The%20use%20cases%20for%20block,it%27s%20used%20naturally%20for%20images + */ -span.red { inline-block; color: red; } -span.green { color: green; } -span.lime { color: #00FF00; } -span.blue { color: blue; } -span.navy { color: navy; } -span.yellow { color: yellow; } -span.magenta { color: magenta; } -span.indigo { color: #4B0082; } -span.cyan { color: cyan; } -span.purple { color: purple; } -span.gold { color: gold; } -span.silver { color: silver; } /* lighter gray */ -span.gray { color: #808080; } /* light gray */ +span.red { display:inline-block; color: red; } +span.green { display:inline-block; color: green; } +span.lime { display:inline-block; color: #00FF00; } +span.blue { display:inline-block; color: blue; } +span.navy { display:inline-block; color: navy; } +span.yellow { display:inline-block; color: yellow; } +span.magenta { display:inline-block; color: magenta; } +span.indigo { display:inline-block; color: #4B0082; } +span.cyan { display:inline-block; color: cyan; } +span.purple { display:inline-block; color: purple; } +span.gold { display:inline-block; color: gold; } +span.silver { display:inline-block; color: silver; } /* lighter gray */ +span.gray { display:inline-block; color: #808080; } /* light gray */ /* role for inline Unicode mathematical equations, making font an italic (as is conventional for equations) @@ -152,7 +151,7 @@ span.gray { color: #808080; } /* light gray */ and a little bigger (* 125%) because the serif font appears smaller than the default sans serif fonts. Used, for example: [role serif_italic This is in serif font and italic]. Used in turn by template for inline expressions to match equations as SVG or PNG images. - + Can be combined with colors and bold. */ span.serif_italic { font-family: serif; @@ -161,7 +160,7 @@ span.serif_italic { font-stretch: expanded; } -/* Custom indent of paragraphs to make equations look nicer, 2% to match that indent of code block above. +/* Custom indent of paragraphs to make equations look nicer. https://www.w3schools.com/tags/tag_blockquote.asp says "Most browsers will display the
element with left and right margin 40px values: " */ diff --git a/doc/multiprecision.css b/doc/multiprecision.css index d26cabb1..586ed8cb 100644 --- a/doc/multiprecision.css +++ b/doc/multiprecision.css @@ -19,10 +19,14 @@ ing file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) Visual Studio is recommended for editing this file because it checks syntax, does layout and provides help on options. - - boost-no-inspect to avoid error message from inspect.exe - doc\multiprecision.css: Unlinked file - (line 1) Broken link: ../../../../doc/src/boostbook.css + +IMPORTANT: there are two versions of this file - + +one in libs/math/doc and one in libs/math/doc/html + +ONLY EVER EDIT THE FIRST OF THESE !!!! + +=============================================================================*/ /*============================================================================= Program listings @@ -41,22 +45,15 @@ Program listings padding: 0.5pc 0.5pc 0.5pc 0.5pc; } -.programlisting, -.screen { - font-size: 10pt; - display: block; - /* was margin: 1pc 4% 0pc 4%; - but that led to overflow on some code lines, so reduced and lined up with blockquote indent (see below). */ - margin: 1pc 2% 0pc 2%; - /* https://www.w3schools.com/Css/css_margin.asp margin-top margin-right margin-bottom margin-left. - * auto - the browser calculates the margin - * length - specifies a margin in px, pt, cm, etc. - * % - specifies a margin in % of the width of the containing element - * inherit - specifies that the margin should be inherited from the parent element - - */ - padding: 0.5pc 0.5pc 0.5pc 0.5pc; -} + .programlisting, + .screen + { + font-size: 10pt; + display: block; + /* was margin: 1pc 4% 0pc 4%; */ + margin: 1pc 2% 0pc 2%; + padding: 0.5pc 0.5pc 0.5pc 0.5pc; + } @media screen { /* Syntax Highlighting */ @@ -132,20 +129,24 @@ span.alignjustify Names at http://www.w3.org/TR/2002/WD-css3-color-20020219/ 4.3. X11 color keywords. Quickbook Usage: [role red Some red text] +inline-block - Flows a element inline with the text, but allows width and height to be specified. + +https://stackoverflow.com/questions/3043021/is-there-any-guide-on-when-to-use-displayblock-when-inline-and-when-inline-b#:~:text=The%20use%20cases%20for%20block,it%27s%20used%20naturally%20for%20images + */ -span.red { inline-block; color: red; } -span.green { color: green; } -span.lime { color: #00FF00; } -span.blue { color: blue; } -span.navy { color: navy; } -span.yellow { color: yellow; } -span.magenta { color: magenta; } -span.indigo { color: #4B0082; } -span.cyan { color: cyan; } -span.purple { color: purple; } -span.gold { color: gold; } -span.silver { color: silver; } /* lighter gray */ -span.gray { color: #808080; } /* light gray */ +span.red { display:inline-block; color: red; } +span.green { display:inline-block; color: green; } +span.lime { display:inline-block; color: #00FF00; } +span.blue { display:inline-block; color: blue; } +span.navy { display:inline-block; color: navy; } +span.yellow { display:inline-block; color: yellow; } +span.magenta { display:inline-block; color: magenta; } +span.indigo { display:inline-block; color: #4B0082; } +span.cyan { display:inline-block; color: cyan; } +span.purple { display:inline-block; color: purple; } +span.gold { display:inline-block; color: gold; } +span.silver { display:inline-block; color: silver; } /* lighter gray */ +span.gray { display:inline-block; color: #808080; } /* light gray */ /* role for inline Unicode mathematical equations, making font an italic (as is conventional for equations) @@ -153,7 +154,7 @@ span.gray { color: #808080; } /* light gray */ and a little bigger (* 125%) because the serif font appears smaller than the default sans serif fonts. Used, for example: [role serif_italic This is in serif font and italic]. Used in turn by template for inline expressions to match equations as SVG or PNG images. - + Can be combined with colors and bold. */ span.serif_italic { font-family: serif; @@ -162,7 +163,7 @@ span.serif_italic { font-stretch: expanded; } -/* Custom indent of paragraphs to make equations look nicer, 2% to match that indent of code block above. +/* Custom indent of paragraphs to make equations look nicer. https://www.w3schools.com/tags/tag_blockquote.asp says "Most browsers will display the
element with left and right margin 40px values: " */ diff --git a/include/boost/multiprecision/cpp_bin_float.hpp b/include/boost/multiprecision/cpp_bin_float.hpp index adcdfcf2..4d83e543 100644 --- a/include/boost/multiprecision/cpp_bin_float.hpp +++ b/include/boost/multiprecision/cpp_bin_float.hpp @@ -380,7 +380,7 @@ class cpp_bin_float if (eval_get_sign(f) < 0) { f.negate(); - *this = f; + assign_float(f); this->negate(); return *this; } diff --git a/test/test_arithmetic.hpp b/test/test_arithmetic.hpp index 66bb55ee..a23baae6 100644 --- a/test/test_arithmetic.hpp +++ b/test/test_arithmetic.hpp @@ -948,7 +948,7 @@ void test_integer_ops(const boost::mpl::int_(); test_integer_round_trip(); test_integer_round_trip(); -#ifndef BOOST_NO_CXX11_LONG_LONG +#ifndef BOOST_NO_LONG_LONG test_integer_round_trip(); test_integer_round_trip(); #endif