Просмотр исходного кода

Merge branch 'master' into next

* master:
  Placate Clang 3.4.1 C++11 bug.
  Update bdlib
  const attribute here makes GCC complain even though it's intended.
Bryan Drewery 7 лет назад
Родитель
Сommit
d54aca7d61
3 измененных файлов с 2 добавлено и 4 удалено
  1. 1 1
      lib/bdlib
  2. 1 2
      src/dcc.cc
  3. 0 1
      src/mod/transfer.mod/transfer.cc

+ 1 - 1
lib/bdlib

@@ -1 +1 @@
-Subproject commit 7cb01ffe4fe8d4387668fce837db9fa065fad69a
+Subproject commit 3d4dc2af4b26864f25911c65de6e6deaf154e971

+ 1 - 2
src/dcc.cc

@@ -1539,7 +1539,7 @@ static void dcc_telnet_dns_callback(int id, void *client_data, const char *ip,
     if (dns_id >= 0)
       dcc[i].dns_id = dns_id;
   } else {
-    const bd::Array<bd::String> empty;
+    const bd::Array<bd::String> empty{};
     dcc_telnet_dns_forward_callback(id, client_data, ip, empty);
   }
 }
@@ -1998,7 +1998,6 @@ struct dcc_table DCC_SOCKET = {
 };
 
 static void
-__attribute__((const))
 dcc_identwait(int idx, char *buf, int len)
 {
   /* Ignore anything now */

+ 0 - 1
src/mod/transfer.mod/transfer.cc

@@ -650,7 +650,6 @@ static void kill_dcc_xfer(int idx, void *x)
 }
 
 static void
-__attribute__((const))
 out_dcc_xfer(int idx, char *buf, void *x)
 {
 }