From b67b41950e6bed7cab0324d53f545ed2ad18fb2a Mon Sep 17 00:00:00 2001
From: Ouyang Yadong <oyydoibh@gmail.com>
Date: Mon, 24 Feb 2020 16:51:41 +0800
Subject: [PATCH] quic: fix clang build

It seems that clang doesn't implicitly convert "unsigned long"
into "unsigned long long" for function templates.

PR-URL: https://github.com/nodejs/quic/pull/352
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
---
 src/quic/node_quic_http3_application.cc | 8 ++++----
 src/quic/node_quic_http3_application.h  | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/quic/node_quic_http3_application.cc b/src/quic/node_quic_http3_application.cc
index 269d71cc0e..7c6147bc2b 100644
--- a/src/quic/node_quic_http3_application.cc
+++ b/src/quic/node_quic_http3_application.cc
@@ -105,10 +105,10 @@ void Http3Header::MemoryInfo(MemoryTracker* tracker) const {
   tracker->TrackField("value", value_);
 }
 
-template <typename T>
+template <typename M, typename T>
 void Http3Application::SetConfig(
     int idx,
-    uint64_t T::*member) {
+    M T::*member) {
   AliasedFloat64Array& buffer = env()->quic_state()->http3config_buffer;
   uint64_t flags = static_cast<uint64_t>(buffer[IDX_HTTP3_CONFIG_COUNT]);
   if (flags & (1ULL << idx))
@@ -120,9 +120,9 @@ Http3Application::Http3Application(
   : QuicApplication(session),
     alloc_info_(MakeAllocator()) {
   // Collect Configuration Details.
-  SetConfig(IDX_HTTP3_QPACK_MAX_TABLE_CAPACITY,
+  SetConfig<size_t>(IDX_HTTP3_QPACK_MAX_TABLE_CAPACITY,
             &Http3ApplicationConfig::qpack_max_table_capacity);
-  SetConfig(IDX_HTTP3_QPACK_BLOCKED_STREAMS,
+  SetConfig<size_t>(IDX_HTTP3_QPACK_BLOCKED_STREAMS,
             &Http3ApplicationConfig::qpack_blocked_streams);
   SetConfig(IDX_HTTP3_MAX_HEADER_LIST_SIZE,
             &Http3ApplicationConfig::max_header_list_size);
diff --git a/src/quic/node_quic_http3_application.h b/src/quic/node_quic_http3_application.h
index 82d11554e3..ca18855757 100644
--- a/src/quic/node_quic_http3_application.h
+++ b/src/quic/node_quic_http3_application.h
@@ -173,8 +173,8 @@ class Http3Application final :
   void MemoryInfo(MemoryTracker* tracker) const override;
 
  private:
-  template <typename T>
-  void SetConfig(int idx, uint64_t T::*member);
+  template <typename M = uint64_t, typename T>
+  void SetConfig(int idx, M T::*member);
 
   nghttp3_conn* connection() const { return connection_.get(); }
   BaseObjectPtr<QuicStream> FindOrCreateStream(int64_t stream_id);