Merge branch 'develop'

Merge pull request #189 from boostorg/use_core_snprintf
Simplify snprintf workaround usage.
2025-07-04 08:06:31 +02:00 · 2023-02-22 18:58:30 +00:00 · 2022-12-15 11:43:05 +00:00 · 2022-12-14 18:39:17 +00:00 · 2022-12-14 13:06:33 +00:00 · 2022-12-13 18:48:59 +00:00
3859 changed files with 29 additions and 6778 deletions
--- a/include/boost/regex/v4/regex_workaround.hpp
+++ b/include/boost/regex/v4/regex_workaround.hpp
@ -198,10 +198,10 @@ namespace boost{ namespace BOOST_REGEX_DETAIL_NS{
      const char *strSource 
   )
   {
-	  std::size_t lenSourceWithNull = std::strlen(strSource) + 1;
-	  if (lenSourceWithNull > sizeInBytes)
+     std::size_t lenSourceWithNull = std::strlen(strSource) + 1;
+     if (lenSourceWithNull > sizeInBytes)
         return 1;
-	  std::memcpy(strDestination, strSource, lenSourceWithNull);
+     std::memcpy(strDestination, strSource, lenSourceWithNull);
      return 0;
   }
   inline std::size_t strcat_s(
@ -210,11 +210,11 @@ namespace boost{ namespace BOOST_REGEX_DETAIL_NS{
      const char *strSource 
   )
   {
-	  std::size_t lenSourceWithNull = std::strlen(strSource) + 1;
-	  std::size_t lenDestination = std::strlen(strDestination);
-	  if (lenSourceWithNull + lenDestination > sizeInBytes)
+     std::size_t lenSourceWithNull = std::strlen(strSource) + 1;
+     std::size_t lenDestination = std::strlen(strDestination);
+     if (lenSourceWithNull + lenDestination > sizeInBytes)
         return 1;
-	  std::memcpy(strDestination + lenDestination, strSource, lenSourceWithNull);
+     std::memcpy(strDestination + lenDestination, strSource, lenSourceWithNull);
      return 0;
   }

--- a/include/boost/regex/v5/regex_workaround.hpp
+++ b/include/boost/regex/v5/regex_workaround.hpp
@ -116,10 +116,10 @@ namespace boost{ namespace BOOST_REGEX_DETAIL_NS{
      const char *strSource 
   )
   {
-	  std::size_t lenSourceWithNull = std::strlen(strSource) + 1;
-	  if (lenSourceWithNull > sizeInBytes)
+     std::size_t lenSourceWithNull = std::strlen(strSource) + 1;
+     if (lenSourceWithNull > sizeInBytes)
         return 1;
-	  std::memcpy(strDestination, strSource, lenSourceWithNull);
+     std::memcpy(strDestination, strSource, lenSourceWithNull);
      return 0;
   }
   inline std::size_t strcat_s(
@ -128,11 +128,11 @@ namespace boost{ namespace BOOST_REGEX_DETAIL_NS{
      const char *strSource 
   )
   {
-	  std::size_t lenSourceWithNull = std::strlen(strSource) + 1;
-	  std::size_t lenDestination = std::strlen(strDestination);
-	  if (lenSourceWithNull + lenDestination > sizeInBytes)
+     std::size_t lenSourceWithNull = std::strlen(strSource) + 1;
+     std::size_t lenDestination = std::strlen(strDestination);
+     if (lenSourceWithNull + lenDestination > sizeInBytes)
         return 1;
-	  std::memcpy(strDestination + lenDestination, strSource, lenSourceWithNull);
+     std::memcpy(strDestination + lenDestination, strSource, lenSourceWithNull);
      return 0;
   }

--- a/src/posix_api.cpp
+++ b/src/posix_api.cpp
@ -22,19 +22,15 @@
 #include <boost/cregex.hpp>
 #include <cstdio>

-#if defined(BOOST_NO_STDC_NAMESPACE)
-namespace std{
-   using ::sprintf;
-   using ::strcpy;
-   using ::strcmp;
-}
-#endif
-
 #ifndef BOOST_WORKAROUND
 #define BOOST_WORKAROUND(x, y) false
 #endif

-
+#ifndef BOOST_REGEX_STANDALONE
+#include <boost/core/snprintf.hpp>
+#else
+namespace boost { namespace core { using std::snprintf; } }
+#endif

 namespace boost{

@ -180,13 +176,7 @@ BOOST_REGEX_DECL regsize_t BOOST_REGEX_CCALL regerrorA(int code, const regex_tA*
            // We're converting an integer i to a string, and since i <= REG_E_UNKNOWN
            // a five character string is *always* large enough:
            //
-#if !defined(BOOST_CXX_VERSION) || (BOOST_CXX_VERSION >= 201103)
-            int r = (std::snprintf)(localbuf, 5, "%d", i);
-#elif BOOST_WORKAROUND(BOOST_MSVC, >= 1400) && !defined(_WIN32_WCE) && !defined(UNDER_CE)
-            int r = (::sprintf_s)(localbuf, 5, "%d", i);
-#else
-            int r = (std::sprintf)(localbuf, "%d", i);
-#endif
+            int r = (boost::core::snprintf)(localbuf, 5, "%d", i);
            if(r < 0)
               return 0; // sprintf failed
            if(std::strlen(localbuf) < buf_size)
@ -194,13 +184,7 @@ BOOST_REGEX_DECL regsize_t BOOST_REGEX_CCALL regerrorA(int code, const regex_tA*
            return std::strlen(localbuf) + 1;
         }
      }
-#if  !defined(BOOST_CXX_VERSION) || (BOOST_CXX_VERSION >= 201103)
-      int r = (::snprintf)(localbuf, 5, "%d", 0);
-#elif BOOST_WORKAROUND(BOOST_MSVC, >= 1400) && !defined(_WIN32_WCE) && !defined(UNDER_CE)
-      int r = (::sprintf_s)(localbuf, 5, "%d", 0);
-#else
-      int r = (std::sprintf)(localbuf, "%d", 0);
-#endif
+      int r = (boost::core::snprintf)(localbuf, 5, "%d", 0);
      if(r < 0)
         return 0; // sprintf failed
      if(std::strlen(localbuf) < buf_size)
--- a/src/wide_posix_api.cpp
+++ b/src/wide_posix_api.cpp
@ -25,6 +25,12 @@
 #include <boost/regex.hpp>
 #include <boost/cregex.hpp>

+#ifndef BOOST_REGEX_STANDALONE
+#include <boost/core/snprintf.hpp>
+#else
+namespace boost { namespace core { using std::swprintf; } }
+#endif
+
 #ifndef BOOST_WORKAROUND
 #define BOOST_WORKAROUND(x, y) false
 #endif
@ -37,15 +43,6 @@
 #pragma warning(disable:981)
 #endif

-#if defined(BOOST_NO_STDC_NAMESPACE) || defined(__NetBSD__)
-namespace std{
-#  ifndef BOOST_NO_SWPRINTF
-      using ::swprintf;
-#  endif
-}
-#endif
-
-
 namespace boost{

 namespace {
@ -181,7 +178,6 @@ BOOST_REGEX_DECL regsize_t BOOST_REGEX_CCALL regerrorW(int code, const regex_tW*
      }
      return result;
   }
-#if !defined(BOOST_NO_SWPRINTF)
   if(code == REG_ATOI)
   {
      wchar_t localbuf[5];
@ -194,7 +190,7 @@ BOOST_REGEX_DECL regsize_t BOOST_REGEX_CCALL regerrorW(int code, const regex_tW*
 #if defined(_WIN32_WCE) && !defined(UNDER_CE)
            (std::swprintf)(localbuf, L"%d", i);
 #else
-            (std::swprintf)(localbuf, 5, L"%d", i);
+            (boost::core::swprintf)(localbuf, 5, L"%d", i);
 #endif
            if(std::wcslen(localbuf) < buf_size)
 #if BOOST_WORKAROUND(BOOST_MSVC, >= 1400) && !defined(_WIN32_WCE) && !defined(UNDER_CE)
@ -208,7 +204,7 @@ BOOST_REGEX_DECL regsize_t BOOST_REGEX_CCALL regerrorW(int code, const regex_tW*
 #if defined(_WIN32_WCE) && !defined(UNDER_CE)
      (std::swprintf)(localbuf, L"%d", 0);
 #else
-      (std::swprintf)(localbuf, 5, L"%d", 0);
+      (boost::core::swprintf)(localbuf, 5, L"%d", 0);
 #endif
      if(std::wcslen(localbuf) < buf_size)
 #if BOOST_WORKAROUND(BOOST_MSVC, >= 1400) && !defined(_WIN32_WCE) && !defined(UNDER_CE)
@ -218,7 +214,6 @@ BOOST_REGEX_DECL regsize_t BOOST_REGEX_CCALL regerrorW(int code, const regex_tW*
 #endif
      return std::wcslen(localbuf) + 1;
   }
-#endif
   if(code <= (int)REG_E_UNKNOWN)
   {
      std::string p;
--- a/test/de_fuzz/corpus/001ba32e9488b739cad5c47cf6743092c3e959ba
+++ b/test/de_fuzz/corpus/001ba32e9488b739cad5c47cf6743092c3e959ba
--- a/test/de_fuzz/corpus/0022cb33f1cee7a46b962b9531184db5c56061df
+++ b/test/de_fuzz/corpus/0022cb33f1cee7a46b962b9531184db5c56061df
--- a/test/de_fuzz/corpus/0024c001b45a2ff3eb568d8a0c3e461aceb73417
+++ b/test/de_fuzz/corpus/0024c001b45a2ff3eb568d8a0c3e461aceb73417
--- a/test/de_fuzz/corpus/008845a0cee378bad5ae87f276ce5f942febab66
+++ b/test/de_fuzz/corpus/008845a0cee378bad5ae87f276ce5f942febab66
--- a/test/de_fuzz/corpus/009a13687872382d9ea4ccb32d90583fcdbd43b7
+++ b/test/de_fuzz/corpus/009a13687872382d9ea4ccb32d90583fcdbd43b7
--- a/test/de_fuzz/corpus/00ebfa429dbb73ad5188bdb5956364b45e4b8c71
+++ b/test/de_fuzz/corpus/00ebfa429dbb73ad5188bdb5956364b45e4b8c71
--- a/test/de_fuzz/corpus/00f8a813a4079f137f5a7ba9ad2d8d759afe8fa6
+++ b/test/de_fuzz/corpus/00f8a813a4079f137f5a7ba9ad2d8d759afe8fa6
--- a/test/de_fuzz/corpus/01745b71bcf3c1f4763f1e0ac7b9ed8e55af4596
+++ b/test/de_fuzz/corpus/01745b71bcf3c1f4763f1e0ac7b9ed8e55af4596
--- a/test/de_fuzz/corpus/01ba758580a918e8dd905999396066804be057d3
+++ b/test/de_fuzz/corpus/01ba758580a918e8dd905999396066804be057d3
--- a/test/de_fuzz/corpus/01daae36295786b241b430e93bc27ecdb21d0e1c
+++ b/test/de_fuzz/corpus/01daae36295786b241b430e93bc27ecdb21d0e1c
--- a/test/de_fuzz/corpus/0214b13c2b40b2fe579aeaa2b803ebbfcd80effb
+++ b/test/de_fuzz/corpus/0214b13c2b40b2fe579aeaa2b803ebbfcd80effb
--- a/test/de_fuzz/corpus/0219a92fba5b22aad678f90c02fea5f718afbb81
+++ b/test/de_fuzz/corpus/0219a92fba5b22aad678f90c02fea5f718afbb81
--- a/test/de_fuzz/corpus/024349a474519deb9e508901eaf34ef39792ff8c
+++ b/test/de_fuzz/corpus/024349a474519deb9e508901eaf34ef39792ff8c
--- a/test/de_fuzz/corpus/024999955824849ef5de2856ee5e29a682bb0991
+++ b/test/de_fuzz/corpus/024999955824849ef5de2856ee5e29a682bb0991
--- a/test/de_fuzz/corpus/025bb14c5c3d27a0908f0bb363dc4988918ff67b
+++ b/test/de_fuzz/corpus/025bb14c5c3d27a0908f0bb363dc4988918ff67b
--- a/test/de_fuzz/corpus/02a5620461612a1944428314410762a948f95bb3
+++ b/test/de_fuzz/corpus/02a5620461612a1944428314410762a948f95bb3
--- a/test/de_fuzz/corpus/02d8400da629642911de8704c15e20932f0d7d38
+++ b/test/de_fuzz/corpus/02d8400da629642911de8704c15e20932f0d7d38
--- a/test/de_fuzz/corpus/02f33a351a3bbc21f6fb7f2f7fd980c730f32cb0
+++ b/test/de_fuzz/corpus/02f33a351a3bbc21f6fb7f2f7fd980c730f32cb0
--- a/test/de_fuzz/corpus/02f406876967292fa39f061dd1ec2ff0e3c53e74
+++ b/test/de_fuzz/corpus/02f406876967292fa39f061dd1ec2ff0e3c53e74
--- a/test/de_fuzz/corpus/031ca47c0959456d1f0dacd483cb3167dfb05aad
+++ b/test/de_fuzz/corpus/031ca47c0959456d1f0dacd483cb3167dfb05aad
--- a/test/de_fuzz/corpus/0334845542326f79e3fafbe94969c6b369f004bc
+++ b/test/de_fuzz/corpus/0334845542326f79e3fafbe94969c6b369f004bc
@ -1 +0,0 @@
-Z(((((((a+)+)+)+)+)+)+)+|Y(((((((a+)+)+)+)+)+)+)+|X(((((((a+)+)+)+)+)+)+)+|W(((((((a+)+)+)+)+)+)+)+|V(((((((a+)+)+)+)+)+)+)+|CZ(((((((a+)+)+)+)+)+)+)+|CY(((((((a+)+)+)+)+)+)+;+|CX(((((((a+)+)+)+)+)+)+)+|CW(((((((a+)+)+)+)+)+)+)+|CV(((((((a+)+)+)+)+)+)+)+|(a+)+b)
--- a/test/de_fuzz/corpus/035e7ceca28af7af6a84062ab32fefa2c54b869f
+++ b/test/de_fuzz/corpus/035e7ceca28af7af6a84062ab32fefa2c54b869f
--- a/test/de_fuzz/corpus/0377c135f27099a908e16b2939f2576c76664cb6
+++ b/test/de_fuzz/corpus/0377c135f27099a908e16b2939f2576c76664cb6
--- a/test/de_fuzz/corpus/03a4aada6edc5cfd457ffe100222aa70fb632303
+++ b/test/de_fuzz/corpus/03a4aada6edc5cfd457ffe100222aa70fb632303
--- a/test/de_fuzz/corpus/03c11cdd4941456244521dbfdcc2c7e203cbf029
+++ b/test/de_fuzz/corpus/03c11cdd4941456244521dbfdcc2c7e203cbf029
--- a/test/de_fuzz/corpus/03ce080ad97029cfc9eef7522183313f1ca6c2d3
+++ b/test/de_fuzz/corpus/03ce080ad97029cfc9eef7522183313f1ca6c2d3
--- a/test/de_fuzz/corpus/045a1eefc4794466a95d88258d9ef04770d73185
+++ b/test/de_fuzz/corpus/045a1eefc4794466a95d88258d9ef04770d73185
--- a/test/de_fuzz/corpus/0493029275f5fd15bdbdeb0cecc75446e6129b5f
+++ b/test/de_fuzz/corpus/0493029275f5fd15bdbdeb0cecc75446e6129b5f
--- a/test/de_fuzz/corpus/04a5b0fee5ba00981cfa30fb43699627807c5cbc
+++ b/test/de_fuzz/corpus/04a5b0fee5ba00981cfa30fb43699627807c5cbc
--- a/test/de_fuzz/corpus/04aef19f0180da14df8d2bcc28635eed295c6af8
+++ b/test/de_fuzz/corpus/04aef19f0180da14df8d2bcc28635eed295c6af8
--- a/test/de_fuzz/corpus/04c166cc1bf6fc1f396da3060e44e2651d37fa50
+++ b/test/de_fuzz/corpus/04c166cc1bf6fc1f396da3060e44e2651d37fa50
--- a/test/de_fuzz/corpus/04ee7e168599133f68121b7560dc006209927d0e
+++ b/test/de_fuzz/corpus/04ee7e168599133f68121b7560dc006209927d0e
--- a/test/de_fuzz/corpus/04fc8bac2ae97c2f41cf8ba47deae7d2269d9ef5
+++ b/test/de_fuzz/corpus/04fc8bac2ae97c2f41cf8ba47deae7d2269d9ef5
--- a/test/de_fuzz/corpus/052e71789f1e90175615dfd24fe118b1a1158673
+++ b/test/de_fuzz/corpus/052e71789f1e90175615dfd24fe118b1a1158673
--- a/test/de_fuzz/corpus/0537a45a09b74990c25c0511657488fadefd84f6
+++ b/test/de_fuzz/corpus/0537a45a09b74990c25c0511657488fadefd84f6
--- a/test/de_fuzz/corpus/0548a644f332978b8d884616855535c6b8a503d9
+++ b/test/de_fuzz/corpus/0548a644f332978b8d884616855535c6b8a503d9
--- a/test/de_fuzz/corpus/055958c72de0a99f046371f1f0c86d99990c0729
+++ b/test/de_fuzz/corpus/055958c72de0a99f046371f1f0c86d99990c0729
--- a/test/de_fuzz/corpus/057bcec01e2afc4cae4d007ead424c189e2cebe3
+++ b/test/de_fuzz/corpus/057bcec01e2afc4cae4d007ead424c189e2cebe3
--- a/test/de_fuzz/corpus/05cb2c374cbbf2e671db840189026b71a3a4783c
+++ b/test/de_fuzz/corpus/05cb2c374cbbf2e671db840189026b71a3a4783c
--- a/test/de_fuzz/corpus/060d2fbcaf8334670802325e0dc9784379fb09a6
+++ b/test/de_fuzz/corpus/060d2fbcaf8334670802325e0dc9784379fb09a6
--- a/test/de_fuzz/corpus/065dc7b9683107bb0fdeee1ad147ca33421b4eda
+++ b/test/de_fuzz/corpus/065dc7b9683107bb0fdeee1ad147ca33421b4eda
--- a/test/de_fuzz/corpus/066a2cab0d331ac0605ded494bad5ce5c37f41be
+++ b/test/de_fuzz/corpus/066a2cab0d331ac0605ded494bad5ce5c37f41be
--- a/test/de_fuzz/corpus/06705f7adc42a06bfa772929ad0cf82b511cc653
+++ b/test/de_fuzz/corpus/06705f7adc42a06bfa772929ad0cf82b511cc653
--- a/test/de_fuzz/corpus/0676b9e95ffea4d9be47eb4c08b53f7e8232ec61
+++ b/test/de_fuzz/corpus/0676b9e95ffea4d9be47eb4c08b53f7e8232ec61
--- a/test/de_fuzz/corpus/06a24e5d1f0e7df307ebbb0b4008608ad03391b3
+++ b/test/de_fuzz/corpus/06a24e5d1f0e7df307ebbb0b4008608ad03391b3
--- a/test/de_fuzz/corpus/06b7a2445e03005d105a6b760d80ca7a0ac495ee
+++ b/test/de_fuzz/corpus/06b7a2445e03005d105a6b760d80ca7a0ac495ee
--- a/test/de_fuzz/corpus/0708c60582050542ce192567ee739c8dbe486f13
+++ b/test/de_fuzz/corpus/0708c60582050542ce192567ee739c8dbe486f13
--- a/test/de_fuzz/corpus/071134750dc8021e4baf15058fe2f9992a7ce222
+++ b/test/de_fuzz/corpus/071134750dc8021e4baf15058fe2f9992a7ce222
--- a/test/de_fuzz/corpus/07284125555baeddc03d1a3637df0ccbcab9d5fb
+++ b/test/de_fuzz/corpus/07284125555baeddc03d1a3637df0ccbcab9d5fb
@ -1 +0,0 @@
-Z(((((((a+)+)+)+)+<2B><><EFBFBD><EFBFBD>)+|Y(((((((a+)+)+)+)+)++)+)|X(((((((a+)+)+)+)+)+)+)+|W((<28><>(((a+)+)+)+)+)+)+)+;|V((()++)+)+|CW(((((((a+)+)+)+((((a+)+)+)+)+)+)+)+|CZ(((((((a+)+)+)+)+)+)+)+|CY(((((((a+)+)+)+)+)+)+)+|CX(((((((a+)+)+)+)+)+)+)+|CW(((((((a+)+)+)+)+)+)+)+|CV,((((((a+)+)+)+)+)+)+)+|(a+)+bc
--- a/test/de_fuzz/corpus/073f4fc7f030f84f79bdc127e67339ae62070436
+++ b/test/de_fuzz/corpus/073f4fc7f030f84f79bdc127e67339ae62070436
--- a/test/de_fuzz/corpus/075ed1f68bdaff705e9ecfd624a98c583ac5e04f
+++ b/test/de_fuzz/corpus/075ed1f68bdaff705e9ecfd624a98c583ac5e04f
--- a/test/de_fuzz/corpus/076187a0bc2ed6e90aab84375d0deca711b61a91
+++ b/test/de_fuzz/corpus/076187a0bc2ed6e90aab84375d0deca711b61a91
--- a/test/de_fuzz/corpus/077ce191a9e857d7a3a3b4e53fbb50a08000ecf0
+++ b/test/de_fuzz/corpus/077ce191a9e857d7a3a3b4e53fbb50a08000ecf0
--- a/test/de_fuzz/corpus/07b2a1c92c817aae0a115bb15b33274cbaac308a
+++ b/test/de_fuzz/corpus/07b2a1c92c817aae0a115bb15b33274cbaac308a
--- a/test/de_fuzz/corpus/07c70aa5c262fdd076e5ec1e59e63d9f8cedaea8
+++ b/test/de_fuzz/corpus/07c70aa5c262fdd076e5ec1e59e63d9f8cedaea8
--- a/test/de_fuzz/corpus/07e5d0b2ec1cbc9040495889dde36395e3ce8a85
+++ b/test/de_fuzz/corpus/07e5d0b2ec1cbc9040495889dde36395e3ce8a85
--- a/test/de_fuzz/corpus/07f38543e3f8cb6ab88d497b0264801e4a5ff751
+++ b/test/de_fuzz/corpus/07f38543e3f8cb6ab88d497b0264801e4a5ff751
--- a/test/de_fuzz/corpus/08002fe03259270af10b36c8ddeacff162cf16b8
+++ b/test/de_fuzz/corpus/08002fe03259270af10b36c8ddeacff162cf16b8
--- a/test/de_fuzz/corpus/081858d1769f43413a1f09fedf1a0cf1c3f72b22
+++ b/test/de_fuzz/corpus/081858d1769f43413a1f09fedf1a0cf1c3f72b22
--- a/test/de_fuzz/corpus/082c2d2030263ff2b818ea7f0aaf98f7470283f6
+++ b/test/de_fuzz/corpus/082c2d2030263ff2b818ea7f0aaf98f7470283f6
--- a/test/de_fuzz/corpus/08549ccfa0aa75f14ca42c08197ca1e87e660823
+++ b/test/de_fuzz/corpus/08549ccfa0aa75f14ca42c08197ca1e87e660823
--- a/test/de_fuzz/corpus/0868c65e2e25e7360ebcd1719625fb0a361abfaa
+++ b/test/de_fuzz/corpus/0868c65e2e25e7360ebcd1719625fb0a361abfaa
--- a/test/de_fuzz/corpus/08691288da54da0cf22ea7d640ced09164743765
+++ b/test/de_fuzz/corpus/08691288da54da0cf22ea7d640ced09164743765
--- a/test/de_fuzz/corpus/087425b8873de5a19c59ed5467aa5de9ba7de6ca
+++ b/test/de_fuzz/corpus/087425b8873de5a19c59ed5467aa5de9ba7de6ca
--- a/test/de_fuzz/corpus/088d22d0e6de8af18ff45d377f04ff3658e0fc80
+++ b/test/de_fuzz/corpus/088d22d0e6de8af18ff45d377f04ff3658e0fc80
--- a/test/de_fuzz/corpus/08940162707893743187e4ab470ed1008612797a
+++ b/test/de_fuzz/corpus/08940162707893743187e4ab470ed1008612797a
--- a/test/de_fuzz/corpus/09180d4e440031e219479ca15da050462c00a908
+++ b/test/de_fuzz/corpus/09180d4e440031e219479ca15da050462c00a908
--- a/test/de_fuzz/corpus/093d19b2925541ea312fa2059f264124a35944b7
+++ b/test/de_fuzz/corpus/093d19b2925541ea312fa2059f264124a35944b7
--- a/test/de_fuzz/corpus/094d59eb83cc607c8c529c495210f83aa2887fbd
+++ b/test/de_fuzz/corpus/094d59eb83cc607c8c529c495210f83aa2887fbd
--- a/test/de_fuzz/corpus/0952b1e6ba0a9beaee02b92efa1990eb8fd855ed
+++ b/test/de_fuzz/corpus/0952b1e6ba0a9beaee02b92efa1990eb8fd855ed
--- a/test/de_fuzz/corpus/09692b8dcf066440274ea5d939aec16eccb10de8
+++ b/test/de_fuzz/corpus/09692b8dcf066440274ea5d939aec16eccb10de8
--- a/test/de_fuzz/corpus/098478e68695340652d4d2e9ed11fbbedad69e63
+++ b/test/de_fuzz/corpus/098478e68695340652d4d2e9ed11fbbedad69e63
--- a/test/de_fuzz/corpus/0985d13f526884e37b5074e8da192ba63f3ec18c
+++ b/test/de_fuzz/corpus/0985d13f526884e37b5074e8da192ba63f3ec18c
--- a/test/de_fuzz/corpus/098b4f661d78550dbe871aa6d2e5474910365a92
+++ b/test/de_fuzz/corpus/098b4f661d78550dbe871aa6d2e5474910365a92
--- a/test/de_fuzz/corpus/0996713c1213c4a3e8a8581bf0fc5cb43f0d9c84
+++ b/test/de_fuzz/corpus/0996713c1213c4a3e8a8581bf0fc5cb43f0d9c84
--- a/test/de_fuzz/corpus/09c39db7ced2e00411bd9bb69e27833c6aa2d47b
+++ b/test/de_fuzz/corpus/09c39db7ced2e00411bd9bb69e27833c6aa2d47b
--- a/test/de_fuzz/corpus/09d1332a1130a84c97303b9c0f8f5c1d22ccd335
+++ b/test/de_fuzz/corpus/09d1332a1130a84c97303b9c0f8f5c1d22ccd335
--- a/test/de_fuzz/corpus/09ddbffe27633f26351167c38ef10a942862462f
+++ b/test/de_fuzz/corpus/09ddbffe27633f26351167c38ef10a942862462f
@ -1 +0,0 @@
-8^\l*(?:((.<2E>*?)\W*(?1)\<5C>*\2[abc]|	|((.)\)W*(?1)\W*\4|\ZZZZZZZZZZZZZZZZZZZZZZ<1B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\pd\)W*(?1)\W*\4|\ZZZZZZZZZZZZZZZZZZZZZZ<1B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><1B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\pd<1B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><1B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\pdquick brown )ox																		
--- a/test/de_fuzz/corpus/09f341b84c20552c905d21c138b184697fab337d
+++ b/test/de_fuzz/corpus/09f341b84c20552c905d21c138b184697fab337d
--- a/test/de_fuzz/corpus/0a04d9267fb8188a0920d5941c62dfcaa392b697
+++ b/test/de_fuzz/corpus/0a04d9267fb8188a0920d5941c62dfcaa392b697
--- a/test/de_fuzz/corpus/0a232c490b266ab32e15a6092c70ebc3dfda6ecc
+++ b/test/de_fuzz/corpus/0a232c490b266ab32e15a6092c70ebc3dfda6ecc
--- a/test/de_fuzz/corpus/0a34e1a8ea9da61a014714961b9818082c4f84be
+++ b/test/de_fuzz/corpus/0a34e1a8ea9da61a014714961b9818082c4f84be
--- a/test/de_fuzz/corpus/0a6ddeb7f27dec9f32913eed61df082aa928c8e7
+++ b/test/de_fuzz/corpus/0a6ddeb7f27dec9f32913eed61df082aa928c8e7
--- a/test/de_fuzz/corpus/0a6f08a511f7fbfe66ca6cf7f98bb5af2f7ef5b8
+++ b/test/de_fuzz/corpus/0a6f08a511f7fbfe66ca6cf7f98bb5af2f7ef5b8
--- a/test/de_fuzz/corpus/0a87a305f83262f88a9e826ca5aa22780faf0f6e
+++ b/test/de_fuzz/corpus/0a87a305f83262f88a9e826ca5aa22780faf0f6e
--- a/test/de_fuzz/corpus/0aae4febecef099e54707b7f8d59b50e70b1cd7c
+++ b/test/de_fuzz/corpus/0aae4febecef099e54707b7f8d59b50e70b1cd7c
--- a/test/de_fuzz/corpus/0ad25b2429db480add874a5d66e4934a53a4f5d8
+++ b/test/de_fuzz/corpus/0ad25b2429db480add874a5d66e4934a53a4f5d8
--- a/test/de_fuzz/corpus/0b7e65a2f97ea6135e0c46e75494a6dc0302192a
+++ b/test/de_fuzz/corpus/0b7e65a2f97ea6135e0c46e75494a6dc0302192a
@ -1,73 +0,0 @@
-'<27>  (?: [\040\t] |  \(
-(?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  |  \( (?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  )* \)  )*
-\)  )*                          # optional leading comment
-(?:    (?:
-[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+    # some number of atom characters...
-(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]) # ..not followed by something that could be part of an atom
-|
-" (?:                      # opening quote...
-[^\\\x80-\xff\n\015"]                #   Anything except backslash and quote
-|                     #    or
-\\ [^\x80-\xff]           #   Escaped something (something != CR)
-)* "  # closing quote
-)                    # initial word
-(?:  (?: [\040\t] |  \(
-(?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  |  \( (?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  )* \)  )*
-\)  )*  \.  (?: [\040\t] |  \(\x80-\xff]+    # some number of atom characters...
-(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]) # ..not followed by something that could be part of an atom
-|
-" (?:                      # opening quote...
-[^\\\x80-\xff\n\015"]                #   Anything except backslash and quote
-|                     #    or
-\\ [^\x80-\xff]           #   Escaped something (something != CR)
-)* "  # closing quote
-)                    # initial word
-(?:  (?: [\040\t] |  \(
-(?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  |  \( (?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  )* \)  )*
-\)  )*  \.  (?: [\040\t] |  \(
-(?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  |  \( (?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  )* \)  )*
-\)  )*   (?:
-[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+    # some number of atom characters...
-(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]) # ..not followed by something that could be part of an atom
-|
-" (?:                      # opening quote...
-[^\\\x80-\xff\n\015"]                #   Anything except backslash and quote
-|                     #    or
-\\ [^\x80-\xff]           #   Escaped something (something != CR)
-)* "  # closing quote
-)  )* # further okay, if led by a period
-(?: (\040\t] |  \(
-(?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  |  \( (?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  )* \)  )*
-\)  )*  @  (?: [\040\t] |  \(
-(?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  |  \( (?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  )* \)  )*
-\)  )*    (?:
-[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+    # some number of atom characters...
-(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]) # ..not followed by something that could be part of an atom
-|   \[                         # [
-(?: [^\\\x80-\xff\n\015\[\]] |  \\ [^\x80-\xff]  )*    #    stuff
-\]                        #           ]
-)                           # initial subdomain
-(?:                                  #
-(?: [\040\t] |  \(
-(?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  |  \( (?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  )* \)  )*
-\)  )*  \.                        # if led by a period...
-(?: [\040\t] |  \(
-(?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  |  \( (?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  )* \)  )*
-\)  )*   (?:
-[^(\04<30>)<>@,;:".\\\[\]\000-\037\x80-\xff]+    # some number of atom characters...
-(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]) # ..not followed by something that could be part of an atom
-|   \[                         # [
-(?: [^\\\x80-\xff\n\015\[\]] |  \\ [^\x80-\xff]  )*    #    stuff
-\]                        #           ]
-)                     #   ...further okay
-)*
-#       address spec
-(?: [\040\t] |  \(
-(?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  |  \( (?:  [^\\\x80-\xff\n\015()]  ^  | \\[\x80-\xff]  )* \)  )*
-\)  )*  > #                  trailing >
-# name and address
-)  (?: [\040\t] |  \(
-(?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  |  \( (?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  )* \)  )*
-\)  )*                       # optional trailing comment
-
-<user@dom.ain>
--- a/test/de_fuzz/corpus/0baba80b8fa0e2cad243b9d2991c91a0b21d391d
+++ b/test/de_fuzz/corpus/0baba80b8fa0e2cad243b9d2991c91a0b21d391d
--- a/test/de_fuzz/corpus/0bb4fd18738ae9cb066d360c1c38dc24820f5381
+++ b/test/de_fuzz/corpus/0bb4fd18738ae9cb066d360c1c38dc24820f5381
--- a/test/de_fuzz/corpus/0bd42ee87aa348ffb47ee72562020e9adcf886e4
+++ b/test/de_fuzz/corpus/0bd42ee87aa348ffb47ee72562020e9adcf886e4
--- a/test/de_fuzz/corpus/0be4c37157dd87807e33cc455664ea3edc87fcb9
+++ b/test/de_fuzz/corpus/0be4c37157dd87807e33cc455664ea3edc87fcb9
--- a/test/de_fuzz/corpus/0c21cc667e1c54469593a46af58f9b0c5eb22074
+++ b/test/de_fuzz/corpus/0c21cc667e1c54469593a46af58f9b0c5eb22074
--- a/test/de_fuzz/corpus/0c2206f5e288d5608e7a14c3b2cf9d1c0fb2a70b
+++ b/test/de_fuzz/corpus/0c2206f5e288d5608e7a14c3b2cf9d1c0fb2a70b
--- a/test/de_fuzz/corpus/0c2647784524e70a77b3e8e6346595096d11c170
+++ b/test/de_fuzz/corpus/0c2647784524e70a77b3e8e6346595096d11c170
--- a/test/de_fuzz/corpus/0c645708b0e1041a59d5a0e533b85789cf49c7e3
+++ b/test/de_fuzz/corpus/0c645708b0e1041a59d5a0e533b85789cf49c7e3
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
John Maddock	4cbcd3078e	Merge branch 'develop'	2023-02-22 18:58:30 +00:00
jzmaddock	237e69caf6	Merge pull request #189 from boostorg/use_core_snprintf Simplify snprintf workaround usage.	2022-12-15 11:43:05 +00:00
jzmaddock	372d3f7a7e	Drop redundant config check.	2022-12-14 18:39:17 +00:00
jzmaddock	362c85cf66	Add swprintf workarounds.	2022-12-14 13:06:33 +00:00
jzmaddock	430419705b	Simplify snprintf workaround usage. Via boost/core/snprintf.hpp Remove some obsolete workarounds. Remove tabs in files. Supersedes https://github.com/boostorg/regex/pull/188.	2022-12-13 18:48:59 +00:00
jzmaddock	1cad53766e	Merge pull request #187 from boostorg/test_standalone Add testing of standalone mode.	2022-12-13 18:19:49 +00:00
John Maddock	a851f2141f	Merge branch 'develop'	2022-06-27 18:36:04 +01:00
John Maddock	57aca85a8e	Merge branch 'develop'	2022-06-26 18:56:14 +01:00
John Maddock	177ee2cc0f	Merge branch 'develop'	2022-03-08 11:34:00 +00:00
John Maddock	63575ddad8	Merge branch 'develop'	2022-03-08 11:32:34 +00:00
John Maddock	e1c8a4b6a4	Merge branch 'develop'	2021-11-15 12:45:47 +00:00
John Maddock	9b946cfcb7	Merge branch 'develop'	2021-11-01 13:19:01 +01:00
John Maddock	86f82635d4	Merge branch 'develop'	2021-07-03 10:17:35 +01:00
John Maddock	0c8158f6ce	Merge branch 'develop'	2021-06-25 19:19:28 +01:00
jzmaddock	a3f97b5bec	Merge pull request #126 from boostorg/header_fix Add missing #include for release.	2021-04-12 08:21:42 +01:00
John Maddock	13a13e58c9	Merge branch 'develop' into header_fix	2021-04-11 18:14:48 +01:00
John Maddock	714eaf8ae9	Merge branch 'develop'	2021-03-07 09:51:58 +00:00
jzmaddock	78e73e29ec	Merge branch 'develop' Fixed Conflicts: doc/html/index.html	2021-02-25 19:27:04 +00:00
jzmaddock	39f28ac456	Fix incorrect references to sub_match having a .last member. Fixes https://github.com/boostorg/regex/issues/115. # Fixed Conflicts: # doc/html/index.html	2020-11-23 18:12:18 +00:00
John Maddock	e9645776f9	Merge branch 'develop'	2020-06-23 18:57:40 +01:00
jzmaddock	ea23777b48	Merge branch 'develop'	2020-04-28 17:41:58 +01:00
jzmaddock	c21b52d87c	Merge branch 'develop' # Conflicts: # doc/html/boost_regex/background.html # doc/html/boost_regex/background/acknowledgements.html # doc/html/boost_regex/background/examples.html # doc/html/boost_regex/background/faq.html # doc/html/boost_regex/background/futher.html # doc/html/boost_regex/background/headers.html # doc/html/boost_regex/background/history.html # doc/html/boost_regex/background/locale.html # doc/html/boost_regex/background/performance.html # doc/html/boost_regex/background/performance/section_id1378460593.html # doc/html/boost_regex/background/performance/section_id1675827111.html # doc/html/boost_regex/background/performance/section_id3141719723.html # doc/html/boost_regex/background/performance/section_id3258595385.html # doc/html/boost_regex/background/performance/section_id3261825021.html # doc/html/boost_regex/background/performance/section_id3752650613.html # doc/html/boost_regex/background/performance/section_id4128344975.html # doc/html/boost_regex/background/performance/section_id4148872883.html # doc/html/boost_regex/background/redist.html # doc/html/boost_regex/background/standards.html # doc/html/boost_regex/background/thread_safety.html # doc/html/boost_regex/captures.html # doc/html/boost_regex/configuration.html # doc/html/boost_regex/configuration/algorithm.html # doc/html/boost_regex/configuration/compiler.html # doc/html/boost_regex/configuration/linkage.html # doc/html/boost_regex/configuration/locale.html # doc/html/boost_regex/configuration/tuning.html # doc/html/boost_regex/format.html # doc/html/boost_regex/format/boost_format_syntax.html # doc/html/boost_regex/format/perl_format.html # doc/html/boost_regex/format/sed_format.html # doc/html/boost_regex/install.html # doc/html/boost_regex/intro.html # doc/html/boost_regex/partial_matches.html # doc/html/boost_regex/ref.html # doc/html/boost_regex/ref/bad_expression.html # doc/html/boost_regex/ref/basic_regex.html # doc/html/boost_regex/ref/concepts.html # doc/html/boost_regex/ref/concepts/charT_concept.html # doc/html/boost_regex/ref/concepts/iterator_concepts.html # doc/html/boost_regex/ref/concepts/traits_concept.html # doc/html/boost_regex/ref/deprecated.html # doc/html/boost_regex/ref/deprecated/old_regex.html # doc/html/boost_regex/ref/deprecated/regex_format.html # doc/html/boost_regex/ref/deprecated/regex_grep.html # doc/html/boost_regex/ref/deprecated/regex_split.html # doc/html/boost_regex/ref/error_type.html # doc/html/boost_regex/ref/internals.html # doc/html/boost_regex/ref/internals/uni_iter.html # doc/html/boost_regex/ref/match_flag_type.html # doc/html/boost_regex/ref/match_results.html # doc/html/boost_regex/ref/non_std_strings.html # doc/html/boost_regex/ref/non_std_strings/icu.html # doc/html/boost_regex/ref/non_std_strings/icu/intro.html # doc/html/boost_regex/ref/non_std_strings/icu/unicode_algo.html # doc/html/boost_regex/ref/non_std_strings/icu/unicode_iter.html # doc/html/boost_regex/ref/non_std_strings/icu/unicode_types.html # doc/html/boost_regex/ref/non_std_strings/mfc_strings.html # doc/html/boost_regex/ref/non_std_strings/mfc_strings/mfc_algo.html # doc/html/boost_regex/ref/non_std_strings/mfc_strings/mfc_intro.html # doc/html/boost_regex/ref/non_std_strings/mfc_strings/mfc_iter.html # doc/html/boost_regex/ref/non_std_strings/mfc_strings/mfc_regex_create.html # doc/html/boost_regex/ref/non_std_strings/mfc_strings/mfc_regex_types.html # doc/html/boost_regex/ref/posix.html # doc/html/boost_regex/ref/regex_iterator.html # doc/html/boost_regex/ref/regex_match.html # doc/html/boost_regex/ref/regex_replace.html # doc/html/boost_regex/ref/regex_search.html # doc/html/boost_regex/ref/regex_token_iterator.html # doc/html/boost_regex/ref/regex_traits.html # doc/html/boost_regex/ref/sub_match.html # doc/html/boost_regex/ref/syntax_option_type.html # doc/html/boost_regex/ref/syntax_option_type/syntax_option_type_basic.html # doc/html/boost_regex/ref/syntax_option_type/syntax_option_type_extended.html # doc/html/boost_regex/ref/syntax_option_type/syntax_option_type_literal.html # doc/html/boost_regex/ref/syntax_option_type/syntax_option_type_overview.html # doc/html/boost_regex/ref/syntax_option_type/syntax_option_type_perl.html # doc/html/boost_regex/ref/syntax_option_type/syntax_option_type_synopsis.html # doc/html/boost_regex/syntax.html # doc/html/boost_regex/syntax/basic_extended.html # doc/html/boost_regex/syntax/basic_syntax.html # doc/html/boost_regex/syntax/character_classes.html # doc/html/boost_regex/syntax/character_classes/optional_char_class_names.html # doc/html/boost_regex/syntax/character_classes/std_char_classes.html # doc/html/boost_regex/syntax/collating_names.html # doc/html/boost_regex/syntax/collating_names/digraphs.html # doc/html/boost_regex/syntax/collating_names/named_unicode.html # doc/html/boost_regex/syntax/collating_names/posix_symbolic_names.html # doc/html/boost_regex/syntax/leftmost_longest_rule.html # doc/html/boost_regex/syntax/perl_syntax.html # doc/html/boost_regex/unicode.html # doc/html/index.html	2019-10-31 17:47:34 +00:00
jzmaddock	18e7b8c463	Merge branch 'develop'	2019-02-24 09:17:34 +00:00
jzmaddock	866d546fd0	Merge branch 'develop'	2018-10-22 19:07:00 +01:00
jzmaddock	309eee3459	doc regen.	2018-09-15 09:00:20 +01:00
jzmaddock	c653a0bf05	Merge branch 'develop'	2018-09-15 08:59:28 +01:00
jzmaddock	a9fc8fb5de	Merge pull request #50 from boostorg/develop Merge Fuzz-bug fixes from develop	2017-11-24 17:25:41 +00:00
jzmaddock	b3f73b4792	Merge pull request #48 from boostorg/develop Merge de-fuzz fixes from develop.	2017-10-29 17:03:03 +00:00
jzmaddock	5bc2a4a301	Merge pull request #39 from boostorg/develop Merge develop to master	2017-10-09 18:27:25 +01:00
jzmaddock	8191d58266	Remove corpus files from master - we don't need them here!	2017-03-03 09:18:29 +00:00
jzmaddock	f0b577a82c	Merge branch 'develop'	2017-03-02 18:33:14 +00:00
jzmaddock	ed556985d7	Merge branch 'develop'	2016-11-03 20:05:53 +01:00
Rene Rivera	bf7d64a7ef	Add, and update, documentation build targets.	2016-10-10 11:39:53 -05:00
jzmaddock	6f02c1a388	Merge branch 'develop'	2016-08-22 12:50:59 +01:00
jzmaddock	dec7b5028d	Merge branch 'develop'	2016-08-10 18:34:37 +01:00
jzmaddock	dd20ac2669	Merge branch 'develop' # Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit.	2016-04-01 18:35:47 +01:00
jzmaddock	d84bab7c4d	Merge branch 'develop'	2016-02-15 19:32:53 +00:00
jzmaddock	9034bd9c02	Merge branch 'develop'	2015-10-20 13:43:25 +01:00
				`@ -1 +0,0 @@`
				`Z(((((((a+)+)+)+)+)+)+)+\|Y(((((((a+)+)+)+)+)+)+)+\|X(((((((a+)+)+)+)+)+)+)+\|W(((((((a+)+)+)+)+)+)+)+\|V(((((((a+)+)+)+)+)+)+)+\|CZ(((((((a+)+)+)+)+)+)+)+\|CY(((((((a+)+)+)+)+)+)+;+\|CX(((((((a+)+)+)+)+)+)+)+\|CW(((((((a+)+)+)+)+)+)+)+\|CV(((((((a+)+)+)+)+)+)+)+\|(a+)+b)`
				`@ -1 +0,0 @@`
				`Z(((((((a+)+)+)+)+<2B><><EFBFBD><EFBFBD>)+\|Y(((((((a+)+)+)+)+)++)+)\|X(((((((a+)+)+)+)+)+)+)+\|W((<28><>(((a+)+)+)+)+)+)+)+;\|V((()++)+)+\|CW(((((((a+)+)+)+((((a+)+)+)+)+)+)+)+\|CZ(((((((a+)+)+)+)+)+)+)+\|CY(((((((a+)+)+)+)+)+)+)+\|CX(((((((a+)+)+)+)+)+)+)+\|CW(((((((a+)+)+)+)+)+)+)+\|CV,((((((a+)+)+)+)+)+)+)+\|(a+)+bc`
				`@ -1 +0,0 @@`
				8^\l(?:((.<2E>?)\W(?1)\<5C>\2[abc]\| \|((.)\)W(?1)\W\4\|\ZZZZZZZZZZZZZZZZZZZZZZ<1B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\pd\)W(?1)\W\4\|\ZZZZZZZZZZZZZZZZZZZZZZ<1B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><1B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\pd<1B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><1B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\pdquick brown )ox