Ticket #7478: 7478.patch

File 7478.patch, 5.0 KB (added by viboes, 10 years ago)

  • boost/ratio/detail/ratio_io.hpp

     
    4444#include <boost/static_string/static_string.hpp>
    4545#endif
    4646
    47 #if defined(BOOST_NO_CXX11_UNICODE_LITERALS) || defined(BOOST_NO_CXX11_CHAR16_T) || defined(BOOST_NO_CXX11_CHAR32_T)
    48 //~ #define BOOST_RATIO_HAS_UNICODE_SUPPORT
     47#if defined(BOOST_NO_CXX11_UNICODE_LITERALS) || defined(BOOST_NO_CXX11_CHAR16_T) || defined(BOOST_NO_CXX11_CHAR32_T) || defined(BOOST_NO_CXX11_U16STRING) || defined(BOOST_NO_CXX11_U32STRING)
     48#if defined BOOST_RATIO_HAS_UNICODE_SUPPORT
     49#undef BOOST_RATIO_HAS_UNICODE_SUPPORT
     50#endif
    4951#else
    5052#define BOOST_RATIO_HAS_UNICODE_SUPPORT 1
    5153#endif

  • boost/ratio/ratio_io.hpp

     
    4949#include <boost/static_string/static_string.hpp>
    5050#endif
    5151
    52 #if defined(BOOST_NO_CXX11_UNICODE_LITERALS) || defined(BOOST_NO_CXX11_CHAR16_T) || defined(BOOST_NO_CXX11_CHAR32_T)
    53 //~ #define BOOST_RATIO_HAS_UNICODE_SUPPORT
     52#if defined(BOOST_NO_CXX11_UNICODE_LITERALS) || defined(BOOST_NO_CXX11_CHAR16_T) || defined(BOOST_NO_CXX11_CHAR32_T) || defined(BOOST_NO_CXX11_U16STRING) || defined(BOOST_NO_CXX11_U32STRING)
     53#if defined BOOST_RATIO_HAS_UNICODE_SUPPORT
     54#undef BOOST_RATIO_HAS_UNICODE_SUPPORT
     55#endif
    5456#else
    5557#define BOOST_RATIO_HAS_UNICODE_SUPPORT 1
    5658#endif
    … …  
    120122    static std::string prefix()  {return std::string("atto");}
    121123};
    122124
    123 #if BOOST_RATIO_HAS_UNICODE_SUPPORT
     125#if defined BOOST_RATIO_HAS_UNICODE_SUPPORT
    124126
    125127template <>
    126128struct ratio_string<atto, char16_t>
    … …  
    165167    static std::string prefix()  {return std::string("femto");}
    166168};
    167169
    168 #if BOOST_RATIO_HAS_UNICODE_SUPPORT
     170#if defined BOOST_RATIO_HAS_UNICODE_SUPPORT
    169171
    170172template <>
    171173struct ratio_string<femto, char16_t>
    … …  
    209211    static std::string prefix()  {return std::string("pico");}
    210212};
    211213
    212 #if BOOST_RATIO_HAS_UNICODE_SUPPORT
     214#if defined BOOST_RATIO_HAS_UNICODE_SUPPORT
    213215
    214216template <>
    215217struct ratio_string<pico, char16_t>
    … …  
    253255    static std::string prefix()  {return std::string("nano");}
    254256};
    255257
    256 #if BOOST_RATIO_HAS_UNICODE_SUPPORT
     258#if defined BOOST_RATIO_HAS_UNICODE_SUPPORT
    257259
    258260template <>
    259261struct ratio_string<nano, char16_t>
    … …  
    297299    static std::string prefix()  {return std::string("micro");}
    298300};
    299301
    300 #if BOOST_RATIO_HAS_UNICODE_SUPPORT
     302#if defined BOOST_RATIO_HAS_UNICODE_SUPPORT
    301303
    302304template <>
    303305struct ratio_string<micro, char16_t>
    … …  
    341343    static std::string prefix()  {return std::string("milli");}
    342344};
    343345
    344 #if BOOST_RATIO_HAS_UNICODE_SUPPORT
     346#if defined BOOST_RATIO_HAS_UNICODE_SUPPORT
    345347
    346348template <>
    347349struct ratio_string<milli, char16_t>
    … …  
    385387    static std::string prefix()  {return std::string("centi");}
    386388};
    387389
    388 #if BOOST_RATIO_HAS_UNICODE_SUPPORT
     390#if defined BOOST_RATIO_HAS_UNICODE_SUPPORT
    389391
    390392template <>
    391393struct ratio_string<centi, char16_t>
    … …  
    430432    static std::string prefix()  {return std::string("deci");}
    431433};
    432434
    433 #if BOOST_RATIO_HAS_UNICODE_SUPPORT
     435#if defined BOOST_RATIO_HAS_UNICODE_SUPPORT
    434436
    435437template <>
    436438struct ratio_string<deci, char16_t>
    … …  
    477479    static std::string prefix()  {return std::string("deca");}
    478480};
    479481
    480 #if BOOST_RATIO_HAS_UNICODE_SUPPORT
     482#if defined BOOST_RATIO_HAS_UNICODE_SUPPORT
    481483
    482484template <>
    483485struct ratio_string<deca, char16_t>
    … …  
    521523    static std::string prefix()  {return std::string("hecto");}
    522524};
    523525
    524 #if BOOST_RATIO_HAS_UNICODE_SUPPORT
     526#if defined BOOST_RATIO_HAS_UNICODE_SUPPORT
    525527
    526528template <>
    527529struct ratio_string<hecto, char16_t>
    … …  
    565567    static std::string prefix()  {return std::string("kilo");}
    566568};
    567569
    568 #if BOOST_RATIO_HAS_UNICODE_SUPPORT
     570#if defined BOOST_RATIO_HAS_UNICODE_SUPPORT
    569571
    570572template <>
    571573struct ratio_string<kilo, char16_t>
    … …  
    610612    static std::string prefix()  {return std::string("mega");}
    611613};
    612614
    613 #if BOOST_RATIO_HAS_UNICODE_SUPPORT
     615#if defined BOOST_RATIO_HAS_UNICODE_SUPPORT
    614616
    615617template <>
    616618struct ratio_string<mega, char16_t>
    … …  
    655657    static std::string prefix()  {return std::string("giga");}
    656658};
    657659
    658 #if BOOST_RATIO_HAS_UNICODE_SUPPORT
     660#if defined BOOST_RATIO_HAS_UNICODE_SUPPORT
    659661
    660662template <>
    661663struct ratio_string<giga, char16_t>
    … …  
    700702    static std::string prefix()  {return std::string("tera");}
    701703};
    702704
    703 #if BOOST_RATIO_HAS_UNICODE_SUPPORT
     705#if defined BOOST_RATIO_HAS_UNICODE_SUPPORT
    704706
    705707template <>
    706708struct ratio_string<tera, char16_t>
    … …  
    744746    static std::string prefix()  {return std::string("peta");}
    745747};
    746748
    747 #if BOOST_RATIO_HAS_UNICODE_SUPPORT
     749#if defined BOOST_RATIO_HAS_UNICODE_SUPPORT
    748750
    749751template <>
    750752struct ratio_string<peta, char16_t>
    … …  
    788790    static std::string prefix()  {return std::string("exa");}
    789791};
    790792
    791 #if BOOST_RATIO_HAS_UNICODE_SUPPORT
     793#if defined BOOST_RATIO_HAS_UNICODE_SUPPORT
    792794
    793795template <>
    794796struct ratio_string<exa, char16_t>