Revert workaround for std::mutex issues on github windows runners.

PiperOrigin-RevId: 648802955
protocolbuffers · Jul 15, 2024 · ba3e7d7 · ba3e7d7
1 parent 861be78
commit ba3e7d7
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 10 deletions.
diff --git a/protos/protos_extension_lock_test.cc b/protos/protos_extension_lock_test.cc
@@ -102,8 +102,6 @@ void TestConcurrentExtensionAccess(::protos::ExtensionRegistry registry) {
   test_theme();
   test_theme_extension();
 }
-#ifndef _MSC_VER
-// TODO Re-enable this once github runner issue is resolved.
 
 TEST(CppGeneratedCode, ConcurrentAccessDoesNotRaceBothLazy) {
   ::upb::Arena arena;
@@ -122,7 +120,5 @@ TEST(CppGeneratedCode, ConcurrentAccessDoesNotRaceBothEager) {
       {{&theme, &ThemeExtension::theme_extension}, arena});
 }
 
-#endif  // _MSC_VER
-
 }  // namespace
 }  // namespace protos_generator::test::protos
diff --git a/src/google/protobuf/compiler/main.cc b/src/google/protobuf/compiler/main.cc
@@ -35,10 +35,7 @@ namespace protobuf {
 namespace compiler {
 
 int ProtobufMain(int argc, char* argv[]) {
-#ifndef _MSC_VER
-  // TODO Re-enable this once github runner issue is resolved.
   absl::InitializeLog();
-#endif  // !_MSC_VER
 
   CommandLineInterface cli;
   cli.AllowPlugins("protoc-");

diff --git a/src/google/protobuf/compiler/main_no_generators.cc b/src/google/protobuf/compiler/main_no_generators.cc
@@ -19,10 +19,7 @@ namespace compiler {
 // This is a version of protoc that has no built-in code generators.
 // See go/protobuf-toolchain-protoc
 int ProtocMain(int argc, char* argv[]) {
-#ifndef _MSC_VER
-  // TODO Re-enable this once github runner issue is resolved.
   absl::InitializeLog();
-#endif  // !_MSC_VER
 
   CommandLineInterface cli;
   cli.AllowPlugins("protoc-");