Fix AppVeyor build.

alialib · Jul 14, 2018 · 75ad3da · 75ad3da
1 parent a5c82c6
commit 75ad3da
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 18 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -65,5 +65,6 @@ for:
 
 build_script:
   - set BOOST_LIBRARYDIR=%BOOST_ROOT%/%LIBRARY_ARCHITECTURE%-msvc-14.1
+  - set CTEST_OUTPUT_ON_FAILURE=1
   - fips gen
   - fips make ctest
diff --git a/src/alia/common.hpp b/src/alia/common.hpp
@@ -308,15 +308,6 @@ some(T const& x)
     return optional<T>(x);
 }
 
-template<class Container>
-struct raii_adaptor : Container
-{
-    ~raii_adaptor()
-    {
-        Container::end();
-    }
-};
-
 // Invoke the standard hash function for a value.
 template<class T>
 size_t

diff --git a/src/alia/signals/adaptors.hpp b/src/alia/signals/adaptors.hpp
@@ -33,10 +33,14 @@ struct readability_faker : signal<
     typename Wrapped::value_type const&
     read() const
     {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wnull-dereference"
+#ifdef __clang__
+    #pragma clang diagnostic push
+    #pragma clang diagnostic ignored "-Wnull-dereference"
+#endif
         return *(typename Wrapped::value_type const*) nullptr;
-#pragma clang diagnostic pop
+#ifdef __clang__
+    #pragma clang diagnostic pop
+#endif
     }
     // LCOV_EXCL_STOP
     bool

diff --git a/src/alia/signals/basic.hpp b/src/alia/signals/basic.hpp
@@ -30,10 +30,14 @@ struct empty_signal : signal<Value, bidirectional_signal>
     Value const&
     read() const
     {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wnull-dereference"
+#ifdef __clang__
+    #pragma clang diagnostic push
+    #pragma clang diagnostic ignored "-Wnull-dereference"
+#endif
         return *(Value const*) nullptr;
-#pragma clang diagnostic pop
+#ifdef __clang__
+    #pragma clang diagnostic pop
+#endif
     }
     // LCOV_EXCL_STOP
     bool

diff --git a/src/alia/signals/core.hpp b/src/alia/signals/core.hpp
@@ -185,10 +185,14 @@ struct signal<Value, write_only_signal> : signal_interface<Value>
     Value const&
     read() const
     {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wnull-dereference"
+#ifdef __clang__
+    #pragma clang diagnostic push
+    #pragma clang diagnostic ignored "-Wnull-dereference"
+#endif
         return *(Value const*) nullptr;
-#pragma clang diagnostic pop
+#ifdef __clang__
+    #pragma clang diagnostic pop
+#endif
     }
     // LCOV_EXCL_STOP
 };