Repo sync for protected CLA branch

docs/build/reference/permissive-standards-conformance.md

@@ -1,7 +1,7 @@
 ---
 title: "/permissive- (Standards conformance)"
 description: "Reference guide to the Microsoft C++ /permissive- (Standards conformance) compiler option."
-ms.date: 06/29/2022
+ms.date: 12/14/2022
 f1_keywords: ["/permissive", "VC.Project.VCCLCompilerTool.ConformanceMode"]
 helpviewer_keywords: ["/permissive compiler options [C++]", "-permissive compiler options [C++]", "Standards conformance compiler options", "permissive compiler options [C++]"]
 ms.assetid: db1cc175-6e93-4a2e-9396-c3725d2d8f71
@@ -52,27 +52,45 @@ void func(int default); // Error C2321: 'default' is a keyword, and
 
 ```cpp
 template <typename T>
-struct B {
-    void f();
+struct B
+{
+    void f() {}
+    template <typename U>
+    struct S { void operator()(){ return; } };
 };
 
 template <typename T>
 struct D : public B<T> // B is a dependent base because its type
                        // depends on the type of T.
 {
-    // One possible fix is to uncomment the following line.
-    // If this is a type, don't forget the 'typename' keyword.
+    // One possible fix for non-template members and function
+    // template members is a using statement:
     // using B<T>::f;
+    // If it's a type, don't forget the 'typename' keyword.
 
-    void g() {
+    void g()
+    {
         f(); // error C3861: 'f': identifier not found
-             // Another fix is to change it to 'this->f();'
+        // Another fix is to change the call to 'this->f();'
+    }
+
+    void h()
+    {
+        S<int> s; // C2065 or C3878
+        // Since template S is dependent, the type must be qualified
+        // with the `typename` keyword.
+        // To fix, replace the declaration of s with:
+        // typename B<T>::template S<int> s;
+        // Or, use this:
+        // typename D::template S<int> s;
+        s();
     }
 };
 
 void h() {
     D<int> d;
     d.g();
+    d.h();
 }
 ```