From 3c2c9812f03204fe9d5c0f2a2fbbb169c2c80c90 Mon Sep 17 00:00:00 2001
From: Thomas Trummer
Date: Mon, 4 Jul 2016 14:14:11 +0200
Subject: [PATCH 1/2] Fix warning for GCC under Cygwin
---
src/unique_path.cpp | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/unique_path.cpp b/src/unique_path.cpp
index d88cbb8..1b05c83 100644
--- a/src/unique_path.cpp
+++ b/src/unique_path.cpp
@@ -28,7 +28,9 @@
# else // BOOST_WINDOWS_API
# include
# include
-# pragma comment(lib, "Advapi32.lib")
+# ifdef _MSC_VER
+# pragma comment(lib, "Advapi32.lib")
+# endif
# endif
namespace {
From e4d01fc0069dc8ca3b5d78d166cd0dd00a99a161 Mon Sep 17 00:00:00 2001
From: Thomas Trummer
Date: Tue, 5 Jul 2016 11:33:12 +0200
Subject: [PATCH 2/2] Fix build error when using C++11 under Cygwin
http://www.boost.org/development/tests/develop/developer/output/timber-cygwin-boost-bin-v2-libs-filesystem-test-operations_test-test-gcc-5-4-0-debug.html
(Assuming the #ifdef is a copy & paste error)
---
test/operations_test.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test/operations_test.cpp b/test/operations_test.cpp
index 9f09da6..f266fc8 100644
--- a/test/operations_test.cpp
+++ b/test/operations_test.cpp
@@ -56,7 +56,7 @@ inline std::wstring convert(const char* c)
return std::wstring(s.begin(), s.end());
}
-#if defined(_MSC_VER) || defined(__GXX_EXPERIMENTAL_CXX0X__)
+#if defined(_MSC_VER)
// Note: these three setenv* functions are not general solutions for the missing
// setenv* problem on VC++. See Microsoft's _putenv for that need, and ticker #7018
// for discussion and rationale for returning void for this test program, which needs