From 6a24a3a4bbd8d31398f48e92d20c76be84a81da8 Mon Sep 17 00:00:00 2001
From: Rene Rivera <grafikrobot@gmail.com>
Date: Mon, 5 Jun 2017 09:14:37 -0500
Subject: [PATCH] Changes for version 1.6.

---
 doc/history.qbk                | 10 ++++++++++
 doc/predef.qbk                 |  8 ++------
 include/boost/predef/version.h |  2 +-
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/doc/history.qbk b/doc/history.qbk
index f49fdcc..4af13d3 100644
--- a/doc/history.qbk
+++ b/doc/history.qbk
@@ -7,6 +7,16 @@ http://www.boost.org/LICENSE_1_0.txt)
 
 [section History]
 
+[heading 1.6]
+
+* Fix Intel C/C++ version 9999 detection to be 12.1.0.
+* Addition of `BOOST_PREDEF_WORKAROUND` and `BOOST_PREDEF_TESTED_AT` macros
+  for defect workarounds and detection.
+* Add ARM64 MSVC SIMD detection. (from Minmin Gong)
+* Add detection of iOS simulator vs device as a platform choice. (from Ruslan
+  Baratov)
+* Fix MinGW incorrect header guard. (from Ruslan Baratov)
+
 [heading 1.5]
 
 * Fix Intel C/C++ compiler version specification.
diff --git a/doc/predef.qbk b/doc/predef.qbk
index 3c802ac..c5d39c6 100644
--- a/doc/predef.qbk
+++ b/doc/predef.qbk
@@ -1,6 +1,6 @@
 [article Boost.Predef
     [quickbook 1.7]
-    [version 1.5]
+    [version 1.6]
     [authors [Rivera, Rene]]
     [copyright 2005-2016 Rene Rivera]
     [copyright 2015 Charly Chevalier]
@@ -114,12 +114,8 @@ done:
 * Additionally, even if there is no auto-configure style option.. It would be
   good to add optionally included headers so that user can get consistent
   version number definitions for libraries they use.
-* Having a consistent set of version number definitions opens the door to
-  improving the user level syntax of libraries that do checks against version
-  numbers. Specifically Boost Config's `BOOST_WORKAROUND` macro would benefit
-  from a more readable syntax. As would the `BOOST_TESTED_AT` detail macro.
 * And obviously there's lots of work to do in reformulating the existing
-  Boost libraries to use the Predef library once it's accepted.
+  Boost libraries to use the Predef library.
 * And there's the continuing work of adding definitions for present and
   future compilers, platforms, architectures, languages, and libraries.
 
diff --git a/include/boost/predef/version.h b/include/boost/predef/version.h
index ebd2b4f..e03469f 100644
--- a/include/boost/predef/version.h
+++ b/include/boost/predef/version.h
@@ -10,6 +10,6 @@ http://www.boost.org/LICENSE_1_0.txt)
 
 #include <boost/predef/version_number.h>
 
-#define BOOST_PREDEF_VERSION BOOST_VERSION_NUMBER(1,5,0)
+#define BOOST_PREDEF_VERSION BOOST_VERSION_NUMBER(1,6,0)
 
 #endif