updated boost on windows

winx64/include/boost/logic/tribool.hpp

@@ -71,6 +71,7 @@ indeterminate(tribool x,
  */
 class tribool
 {
+#if defined( BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS )
 private:
   /// INTERNAL ONLY
   struct dummy {
@@ -78,6 +79,7 @@ private:
   };
 
   typedef void (dummy::*safe_bool)();
+#endif
 
 public:
   /**
@@ -109,11 +111,22 @@ public:
    * \returns true if the 3-state boolean is true, false otherwise
    * \throws nothrow
    */
+#if !defined( BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS )
+
+  BOOST_CONSTEXPR explicit operator bool () const BOOST_NOEXCEPT
+  {
+    return value == true_value;
+  }
+
+#else
+
   BOOST_CONSTEXPR operator safe_bool() const BOOST_NOEXCEPT
   {
     return value == true_value? &dummy::nonnull : 0;
   }
 
+#endif
+
   /**
    * The actual stored value in this 3-state boolean, which may be false, true,
    * or indeterminate.
@@ -164,7 +177,7 @@ BOOST_CONSTEXPR inline tribool operator!(tribool x) BOOST_NOEXCEPT
 }
 
 /**
- * \brief Computes the logical conjuction of two tribools
+ * \brief Computes the logical conjunction of two tribools
  *
  * \returns the result of logically ANDing the two tribool values,
  * according to the following table:

winx64/include/boost/logic/tribool_io.hpp

@@ -45,7 +45,7 @@ template<>
 inline std::basic_string<char> default_false_name<char>()
 { return "false"; }
 
-#  ifndef BOOST_NO_WCHAR_T
+#  if !defined(BOOST_NO_CWCHAR)
 /**
  * \brief Returns the wide character string L"false".
  *
@@ -76,7 +76,7 @@ template<>
 inline std::basic_string<char> default_true_name<char>()
 { return "true"; }
 
-#  ifndef BOOST_NO_WCHAR_T
+#  if !defined(BOOST_NO_CWCHAR)
 /**
  * \brief Returns the wide character string L"true".
  *
@@ -104,7 +104,7 @@ template<>
 inline std::basic_string<char> get_default_indeterminate_name<char>()
 { return "indeterminate"; }
 
-#ifndef BOOST_NO_WCHAR_T
+#if !defined(BOOST_NO_CWCHAR)
 /// Returns the wide character string L"indeterminate".
 template<>
 inline std::basic_string<wchar_t> get_default_indeterminate_name<wchar_t>()