From fdd7a207c12ec6851e211771f586eb6a9fe1f792 Mon Sep 17 00:00:00 2001
From: Chengzhong Wu <cwu631@bloomberg.net>
Date: Fri, 6 Dec 2024 09:44:11 +0000
Subject: [PATCH] src,build: add no user defined deduction guides of CTAD check

PR-URL: https://github.com/nodejs/node/pull/56071
Refs: https://google.github.io/styleguide/cppguide.html#CTAD
Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
---
 node.gyp            | 1 +
 node.gypi           | 6 +++++-
 src/quic/session.cc | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/node.gyp b/node.gyp
index daaf34c8c67a11..d97004c8e148be 100644
--- a/node.gyp
+++ b/node.gyp
@@ -481,6 +481,7 @@
         '-Wno-unused-parameter',
         '-Werror=undefined-inline',
         '-Werror=extra-semi',
+        '-Werror=ctad-maybe-unsupported',
       ],
     },
 
diff --git a/node.gypi b/node.gypi
index c61e9b170a05c9..7ae62bd7e7134a 100644
--- a/node.gypi
+++ b/node.gypi
@@ -27,7 +27,11 @@
 
   'conditions': [
     [ 'clang==1', {
-      'cflags': [ '-Werror=undefined-inline', '-Werror=extra-semi']
+      'cflags': [
+        '-Werror=undefined-inline',
+        '-Werror=extra-semi',
+        '-Werror=ctad-maybe-unsupported',
+      ],
     }],
     [ '"<(_type)"=="executable"', {
       'msvs_settings': {
diff --git a/src/quic/session.cc b/src/quic/session.cc
index b98ce4a132af60..4323c9268fdac2 100644
--- a/src/quic/session.cc
+++ b/src/quic/session.cc
@@ -1531,7 +1531,7 @@ void Session::EmitDatagram(Store&& datagram, DatagramReceivedFlags flag) {
   DCHECK(!is_destroyed());
   if (!env()->can_call_into_js()) return;
 
-  CallbackScope cbv_scope(this);
+  CallbackScope<Session> cbv_scope(this);
 
   Local<Value> argv[] = {datagram.ToUint8Array(env()),
                          v8::Boolean::New(env()->isolate(), flag.early)};