From 8963fbf8cd5054d8a7cae5dec60c9dc897cd8471 Mon Sep 17 00:00:00 2001
From: "Stephan T. Lavavej" <stl@nuwen.net>
Date: Tue, 20 Jun 2023 14:21:13 -0700
Subject: [PATCH 1/2] Add test coverage.

---
 tests/std/tests/P2465R3_standard_library_modules/env.lst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/std/tests/P2465R3_standard_library_modules/env.lst b/tests/std/tests/P2465R3_standard_library_modules/env.lst
index bce5b396773..759f0d18023 100644
--- a/tests/std/tests/P2465R3_standard_library_modules/env.lst
+++ b/tests/std/tests/P2465R3_standard_library_modules/env.lst
@@ -15,3 +15,4 @@ PM_CL="/MT"
 PM_CL="/MTd"
 PM_CL="/MDd /analyze:only /analyze:autolog-"
 PM_CL="/MDd /GR- /D_HAS_STATIC_RTTI=0"
+PM_CL="/MDd /utf-8"

From e3202d209f33af5def2c4eec3b6b6aa706afeb2c Mon Sep 17 00:00:00 2001
From: "Stephan T. Lavavej" <stl@nuwen.net>
Date: Tue, 20 Jun 2023 14:23:34 -0700
Subject: [PATCH 2/2] Improved workaround.

---
 stl/inc/ostream | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stl/inc/ostream b/stl/inc/ostream
index 6658a75d81e..beef34bae1e 100644
--- a/stl/inc/ostream
+++ b/stl/inc/ostream
@@ -1126,7 +1126,7 @@ void _Vprint_nonunicode_impl(
     _Ostr.setstate(_State);
 }
 
-template <class _Filebuf_type = filebuf>
+_EXPORT_STD /* TRANSITION, VSO-1538698 */ template <class _Filebuf_type = filebuf>
 ios_base::iostate _Print_noformat_unicode(ostream& _Ostr, const string_view _Str) {
     // *LOCKED*
     //