Merge branch 'develop'

Clean up some sloppy include guards that were clashing with other Boost projects
Comment two lines of code to try to prevent user confusion error_codes and error_conditions, such exhibited by ticket #12574 .
2026-04-29 02:13:19 +02:00 · 2017-02-17 06:49:49 -05:00 · 2017-01-23 17:08:17 -05:00 · 2016-11-28 08:32:26 -05:00 · 2016-02-23 10:58:27 -05:00 · 2016-02-22 10:36:06 -05:00
16 changed files with 244 additions and 80 deletions
@@ -7,8 +7,8 @@

 //  See library home page at http://www.boost.org/libs/system

-#ifndef BOOST_CERRNO_HPP
-#define BOOST_CERRNO_HPP
+#ifndef BOOST_SYSTEM_CERRNO_HPP
+#define BOOST_SYSTEM_CERRNO_HPP

 #include <cerrno>

@@ -7,8 +7,8 @@

 //  See library home page at http://www.boost.org/libs/system

-#ifndef BOOST_CYGWIN_ERROR_HPP
-#define BOOST_CYGWIN_ERROR_HPP
+#ifndef BOOST_SYSTEM_CYGWIN_ERROR_HPP
+#define BOOST_SYSTEM_CYGWIN_ERROR_HPP

 //  This header is effectively empty for compiles on operating systems where
 //  it is not applicable.
@@ -53,4 +53,4 @@ namespace boost

 #endif  // __CYGWIN__

-#endif  // BOOST_CYGWIN_ERROR_HPP
+#endif  // BOOST_SYSTEM_CYGWIN_ERROR_HPP
@@ -22,7 +22,7 @@

 # if defined( BOOST_WINDOWS_API )
 #   include <windows.h>
-# if BOOST_PLAT_WINDOWS_DESKTOP
+#   if !BOOST_PLAT_WINDOWS_RUNTIME
 #     include <boost/system/detail/local_free_on_destruction.hpp>
 #   endif
 #   ifndef ERROR_INCORRECT_SIZE
@@ -368,54 +368,7 @@ namespace

  std::string system_error_category::message( int ev ) const
  {
-#if BOOST_PLAT_WINDOWS_DESKTOP
-    std::string str( 128, char() );
-    for (;;)
-    {
-      DWORD retval = ::FormatMessageA(
-          FORMAT_MESSAGE_FROM_SYSTEM |
-          FORMAT_MESSAGE_IGNORE_INSERTS,
-          NULL,
-          ev,
-          MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), // Default language
-          &str[0],
-          str.size(),
-          NULL
-      );
-
-      if ( retval > 0 )
-      {
-        str.resize( retval );
-        break;
-      }
-      else if ( ::GetLastError() != ERROR_INSUFFICIENT_BUFFER )
-      {
-        return std::string("Unknown error");
-      }
-      else
-      {
-        str.resize( str.size() + str.size()/2 );
-      }
-    }
-# elif !defined(BOOST_NO_ANSI_APIS)
-    LPVOID lpMsgBuf = 0;
-    DWORD retval = ::FormatMessageA(
-        FORMAT_MESSAGE_ALLOCATE_BUFFER |
-        FORMAT_MESSAGE_FROM_SYSTEM |
-        FORMAT_MESSAGE_IGNORE_INSERTS,
-        NULL,
-        ev,
-        MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), // Default language
-        (LPSTR) &lpMsgBuf,
-        0,
-        NULL
-    );
-    detail::local_free_on_destruction lfod(lpMsgBuf);
-    if (retval == 0)
-        return std::string("Unknown error");
-
-    std::string str( static_cast<LPCSTR>(lpMsgBuf) );
-# else  // WinCE and Windows Runtime workaround
+#if defined(UNDER_CE) || BOOST_PLAT_WINDOWS_RUNTIME || defined(BOOST_NO_ANSI_APIS)
    std::wstring buf(128, wchar_t());
    for (;;)
    {
@@ -453,6 +406,24 @@ namespace
    }

    std::string str( narrow_buffer );
+#else
+    LPVOID lpMsgBuf = 0;
+    DWORD retval = ::FormatMessageA(
+        FORMAT_MESSAGE_ALLOCATE_BUFFER |
+        FORMAT_MESSAGE_FROM_SYSTEM |
+        FORMAT_MESSAGE_IGNORE_INSERTS,
+        NULL,
+        ev,
+        MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), // Default language
+        (LPSTR) &lpMsgBuf,
+        0,
+        NULL
+    );
+    detail::local_free_on_destruction lfod(lpMsgBuf);
+    if (retval == 0)
+        return std::string("Unknown error");
+
+    std::string str( static_cast<LPCSTR>(lpMsgBuf) );
 # endif
    while ( str.size()
      && (str[str.size()-1] == '\n' || str[str.size()-1] == '\r') )
@@ -8,8 +8,8 @@

 //  See library home page at http://www.boost.org/libs/system

-#ifndef BOOST_ERROR_CODE_HPP
-#define BOOST_ERROR_CODE_HPP
+#ifndef BOOST_SYSTEM_ERROR_CODE_HPP
+#define BOOST_SYSTEM_ERROR_CODE_HPP

 #include <boost/system/config.hpp>
 #include <boost/cstdint.hpp>
@@ -39,8 +39,9 @@ namespace boost
  namespace system
  {

-    class error_code;
-    class error_condition;
+    class error_code;         // values defined by the operating system
+    class error_condition;    // portable generic values defined below, but ultimately
+                              // based on the POSIX standard

    //  "Concept" helpers  ---------------------------------------------------//

@@ -218,9 +219,9 @@ namespace boost
    inline const error_category &  get_system_category() { return system_category(); }
    inline const error_category &  get_generic_category() { return generic_category(); }
    inline const error_category &  get_posix_category() { return generic_category(); }
-    static const error_category &  posix_category = generic_category();
-    static const error_category &  errno_ecat     = generic_category();
-    static const error_category &  native_ecat    = system_category();
+    static const error_category &  posix_category BOOST_ATTRIBUTE_UNUSED = generic_category();
+    static const error_category &  errno_ecat     BOOST_ATTRIBUTE_UNUSED = generic_category();
+    static const error_category &  native_ecat    BOOST_ATTRIBUTE_UNUSED = system_category();
 # endif

    //  class error_condition  -----------------------------------------------//
@@ -515,6 +516,6 @@ namespace boost
 #   include <boost/system/detail/error_code.ipp>
 # endif

-#endif // BOOST_ERROR_CODE_HPP
+#endif // BOOST_SYSTEM_ERROR_CODE_HPP


@@ -7,8 +7,8 @@

 //  See library home page at http://www.boost.org/libs/system

-#ifndef BOOST_LINUX_ERROR_HPP
-#define BOOST_LINUX_ERROR_HPP
+#ifndef BOOST_SYSTEM_LINUX_ERROR_HPP
+#define BOOST_SYSTEM_LINUX_ERROR_HPP

 //  This header is effectively empty for compiles on operating systems where
 //  it is not applicable.
@@ -107,4 +107,4 @@ namespace boost

 #endif  // Linux

-#endif  // BOOST_LINUX_ERROR_HPP
+#endif  // BOOST_SYSTEM_LINUX_ERROR_HPP
@@ -5,8 +5,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

-#ifndef BOOST_SYSTEM_ERROR_HPP
-#define BOOST_SYSTEM_ERROR_HPP
+#ifndef BOOST_SYSTEM_SYSTEM_ERROR_HPP
+#define BOOST_SYSTEM_SYSTEM_ERROR_HPP

 #include <string>
 #include <stdexcept>
@@ -79,6 +79,6 @@ namespace boost
  } // namespace system
 } // namespace boost

-#endif // BOOST_SYSTEM_ERROR_HPP
+#endif // BOOST_SYSTEM_SYSTEM_ERROR_HPP


@@ -7,8 +7,8 @@

 //  See library home page at http://www.boost.org/libs/system

-#ifndef BOOST_WINDOWS_ERROR_HPP
-#define BOOST_WINDOWS_ERROR_HPP
+#ifndef BOOST_SYSTEM_WINDOWS_ERROR_HPP
+#define BOOST_SYSTEM_WINDOWS_ERROR_HPP

 //  This header is effectively empty for compiles on operating systems where
 //  it is not applicable.
@@ -18,7 +18,15 @@
 #ifdef BOOST_WINDOWS_API

 #include <boost/system/error_code.hpp>
+
+// Neither MinGW or Cygwin versions of winerror.h work if used alone, so on
+// either of those platforms include the full windows.h
+
+#if defined(__MINGW32__) || defined(__CYGWIN__)
+#include <windows.h>
+#else
 #include <winerror.h>
+#endif

 namespace boost
 {
@@ -115,4 +123,4 @@ namespace boost

 #endif  // BOOST_WINDOWS_API

-#endif  // BOOST_WINDOWS_ERROR_HPP
+#endif  // BOOST_SYSTEM_WINDOWS_ERROR_HPP
@@ -0,0 +1,11 @@
+{
+    "key": "system",
+    "name": "System",
+    "authors": [
+        "Beman Dawes"
+    ],
+    "description": "Operating system support, including the diagnostics support that will be part of the C++0x standard library.",
+    "category": [
+        "System"
+    ]
+}
@@ -52,4 +52,7 @@ project
         [ run header_only_test.cpp
           :  :  : <link>static
         ]
+         [ run config_test.cpp
+           :  :  : <test-info>always_show_run_output 
+         ]
         ;
@@ -0,0 +1,65 @@
+//  error_code_test.cpp  ---------------------------------------------------------------//
+
+//  Copyright Beman Dawes 2014
+
+//  Distributed under the Boost Software License, Version 1.0.
+//  See http://www.boost.org/LICENSE_1_0.txt
+
+//  See library home page at http://www.boost.org/libs/system
+
+#include <boost/system/config.hpp>
+#include <iostream>
+
+using std::cout;
+using std::endl;
+
+int main()
+{
+#ifdef BOOST_WINDOWS_API
+  std::cout << "BOOST_WINDOWS_API is defined" << std::endl;
+#else
+  std::cout << "BOOST_WINDOWS_API is not defined" << std::endl;
+#endif
+#ifdef _MSC_VER
+  std::cout << "_MSC_VER is defined as " <<  _MSC_VER << std::endl;
+#else
+  std::cout << "_MSC_VER is not defined" << std::endl;
+#endif
+#ifdef  __CYGWIN__
+  std::cout << "__CYGWIN__ is defined" << std::endl;
+#else
+  std::cout << "__CYGWIN__ is not defined" << std::endl;
+#endif
+#ifdef __MINGW32__
+  std::cout << "__MINGW32__ is defined" << std::endl;
+#else
+  std::cout << "__MINGW32__ is not defined" << std::endl;
+#endif
+#ifdef BOOST_POSIX_API
+  std::cout << "BOOST_POSIX_API is defined" << std::endl;
+#else
+  std::cout << "BOOST_POSIX_API is not defined" << std::endl;
+#endif
+#ifdef BOOST_PLAT_WINDOWS_DESKTOP
+  std::cout << "BOOST_PLAT_WINDOWS_DESKTOP is defined as "
+    << BOOST_PLAT_WINDOWS_DESKTOP << std::endl;
+#else
+  std::cout << "BOOST_PLAT_WINDOWS_DESKTOP is not defined" << std::endl;
+#endif
+#ifdef BOOST_NO_ANSI_APIS
+  std::cout << "BOOST_NO_ANSI_APIS is defined" << std::endl;
+#else
+  std::cout << "BOOST_NO_ANSI_APIS is not defined" << std::endl;
+#endif
+#ifdef BOOST_NO_CXX11_NOEXCEPT
+  std::cout << "BOOST_NO_CXX11_NOEXCEPT is defined" << std::endl;
+#else
+  std::cout << "BOOST_NO_CXX11_NOEXCEPT is not defined" << std::endl;
+#endif
+#ifdef BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS
+  std::cout << "BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS is defined" << std::endl;
+#else
+  std::cout << "BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS is not defined" << std::endl;
+#endif
+  return 0;
+}
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{E18C2B56-DCEC-438F-9C38-3C8B08B65247}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>config_test</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\common.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\common.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>true</SDLCheck>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>true</SDLCheck>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\config_test.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\include\boost\system\api_config.hpp" />
+    <ClInclude Include="..\..\..\include\boost\system\config.hpp" />
+    <ClInclude Include="..\..\..\include\boost\system\cygwin_error.hpp" />
+    <ClInclude Include="..\..\..\include\boost\system\error_code.hpp" />
+    <ClInclude Include="..\..\..\include\boost\system\linux_error.hpp" />
+    <ClInclude Include="..\..\..\include\boost\system\system_error.hpp" />
+    <ClInclude Include="..\..\..\include\boost\system\windows_error.hpp" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
    <ProjectConfiguration Include="Debug|Win32">
      <Configuration>Debug</Configuration>
@@ -19,13 +19,13 @@
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
    <CharacterSet>Unicode</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
  </PropertyGroup>
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
    <ProjectConfiguration Include="Debug|Win32">
      <Configuration>Debug</Configuration>
@@ -19,13 +19,13 @@
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
    <CharacterSet>Unicode</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
  </PropertyGroup>
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
    <ProjectConfiguration Include="Debug|Win32">
      <Configuration>Debug</Configuration>
@@ -19,13 +19,13 @@
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
    <CharacterSet>Unicode</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
  </PropertyGroup>
@@ -1,12 +1,16 @@

 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Express 2013 for Windows Desktop
+VisualStudioVersion = 12.0.30626.0
+MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "system-dll", "system-dll\system-dll.vcxproj", "{419402D4-F990-4B05-A459-655E2DC33DC2}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "error_code_test", "error_code_test\error_code_test.vcxproj", "{E50C14DC-547D-4C33-83EA-653C0D0D4E64}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "header_only_test", "header_only_test\header_only_test.vcxproj", "{3773451B-A618-4A26-A7F2-85554F4BD21B}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "config_test", "config_test\config_test.vcxproj", "{E18C2B56-DCEC-438F-9C38-3C8B08B65247}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -25,6 +29,10 @@ Global
 		{3773451B-A618-4A26-A7F2-85554F4BD21B}.Debug|Win32.Build.0 = Debug|Win32
 		{3773451B-A618-4A26-A7F2-85554F4BD21B}.Release|Win32.ActiveCfg = Release|Win32
 		{3773451B-A618-4A26-A7F2-85554F4BD21B}.Release|Win32.Build.0 = Release|Win32
+		{E18C2B56-DCEC-438F-9C38-3C8B08B65247}.Debug|Win32.ActiveCfg = Debug|Win32
+		{E18C2B56-DCEC-438F-9C38-3C8B08B65247}.Debug|Win32.Build.0 = Debug|Win32
+		{E18C2B56-DCEC-438F-9C38-3C8B08B65247}.Release|Win32.ActiveCfg = Release|Win32
+		{E18C2B56-DCEC-438F-9C38-3C8B08B65247}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
Author	SHA1	Message	Date
Beman	504c5e95ee	Merge branch 'develop'	2017-02-17 06:49:49 -05:00
Beman	dc985cb3bc	Clean up some sloppy include guards that were clashing with other Boost projects	2017-01-23 17:08:17 -05:00
Beman	af1f767dfe	Comment two lines of code to try to prevent user confusion error_codes and error_conditions, such exhibited by ticket #12574 .	2016-11-28 08:32:26 -05:00
Beman	388b3497af	Revert the prior change (do not include windows.h). It worked fine with the msvc toolset, testing with the last four VC++ versions. But it failed with GCC version 4.9.3 cygwin64.	2016-02-23 10:58:27 -05:00
Beman Dawes	b4aa25dc0e	Merge pull request #9 from jlodos/feature/do_not_include_windows.h Feature/do not include windows.h	2016-02-22 10:36:06 -05:00
Jorge Lodos	4fecb0a505	Merge branch 'feature/do_not_include_windows.h' of github.com:jlodos/system into feature/do_not_include_windows.h # Conflicts: # include/boost/system/detail/error_code.ipp	2016-02-18 22:02:43 -06:00
Jorge Lodos	561ac00345	Do not include windows.h in header only mode	2016-02-18 22:00:34 -06:00
Jorge Lodos	7c0e5f7c0d	Do not include windows.h in header only mode	2016-02-18 21:49:53 -06:00
Beman Dawes	e374f766ea	Merge pull request #7 from Lastique/patch-1 Fix gcc warnings about unused variables	2015-11-21 10:24:38 -05:00
Andrey Semashev	241f69c55e	Fix gcc warnings about unused variables	2015-11-16 16:42:21 +03:00
Beman	69252d03b1	Upgrade to VC++ 14.0 2015	2015-01-19 14:11:39 -05:00
Beman	db3dd13fb6	Rename test/system directory to test/msvc	2015-01-19 14:09:21 -05:00
Beman	e5da5ce2cf	Merge remote-tracking branch 'remotes/origin/develop'	2015-01-06 11:08:27 -05:00
Beman Dawes	cd8828db96	Merge pull request #5 from danieljames/metadata Create metadata file.	2015-01-06 10:58:04 -05:00
Daniel James	43b08da03a	Add metadata file.	2014-08-18 15:11:09 +01:00
Beman	dcf45d36e5	Neither MinGW or Cygwin versions of winerror.h work if used alone, so on either of these platforms include the full windows.h. Move reporting of configuration to a separate config_test.cpp program, and expand the coverage to report more macros.	2014-08-03 13:44:11 -07:00
Beman	614ae2bd7f	Merge branch 'MSOpenTech-fixforcygwin' into develop	2014-08-03 13:39:31 -07:00
Beman	9379d94b2a	Show value of BOOST_PLAT_WINDOWS_DESKTOP	2014-08-02 08:11:13 -04:00
Beman	800fce3aaf	Neither MinGW or Cygwin versions of winerror.h work if used alone, so on either of these platforms include the full windows.h. Move reporting of configuration to a separate config_test.cpp program, and expand the coverage to report more macros.	2014-08-01 10:49:40 -04:00
Beman	0d0e14b3c5	Show more macros as defined or not defined to aid regression test interpretation.	2014-08-01 07:19:58 -04:00
Beman	3d081e761d	Merge branch 'MSOpenTech-fixforcygwin' into develop	2014-07-30 15:07:01 -04:00
Steve Gates	2f2c97caa8	Fixing break on cygwin because local_free_on_destruction.hpp is not included. Ticket #10137.	2014-06-19 20:30:41 -07:00