Merge branch 'master' of github.com:sandstorm-io/capnproto

c++/src/capnp/capability-test.c++

@@ -510,14 +510,6 @@ public:
             // Too lazy to write a whole separate test for each of these cases...  so just make
             // sure they both compile here, and only actually test the latter.
             box.set("cap", kj::heap<TestExtendsDynamicImpl>(callCount));
-#if __GNUG__ && !__clang__
-            // The last line in this block tickles a bug in Debian G++ 4.9.2:
-            //     https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=781060
-            // For the moment, we can get away with skipping it as the previous line will set
-            // things up in a way that allows the test to complete successfully.
-            // TODO(soon): Remove this #if block when the bug is fixed.
-            return;
-#endif
             box.set("cap", kj::heap<TestExtendsImpl>(callCount));
           });
     } else {

c++/src/kj/async-unix-test.c++

@@ -475,7 +475,8 @@ TEST(AsyncUnixTest, UrgentObserver) {
   // Spawn a TCP server
   KJ_SYSCALL(tmpFd = socket(AF_INET, SOCK_STREAM, 0));
   kj::AutoCloseFd serverFd(tmpFd);
-  sockaddr_in saddr = {};
+  sockaddr_in saddr;
+  memset(&saddr, 0, sizeof(saddr));
   saddr.sin_family = AF_INET;
   saddr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
   KJ_SYSCALL(bind(serverFd, reinterpret_cast<sockaddr*>(&saddr), sizeof(saddr)));

super-test.sh

@@ -240,8 +240,9 @@ if [ $IS_CLANG = yes ]; then
   export CXXFLAGS="$CXXFLAGS -Wno-error=unused-command-line-argument"
 else
   # GCC emits uninitialized warnings all over and they seem bogus. We use valgrind to test for
-  # uninitialized memory usage later on.
-  CXXFLAGS="$CXXFLAGS -Wno-maybe-uninitialized"
+  # uninitialized memory usage later on. GCC 4 also emits strange bogus warnings with
+  # -Wstrict-overflow, so we disable it.
+  CXXFLAGS="$CXXFLAGS -Wno-maybe-uninitialized -Wno-strict-overflow"
 fi
 
 cd c++