Remove unnecessary setting of locale::global (AcademySoftwareFoundati…

…on#1636)

Signed-off-by: Daniel Dresser <danield@image-engine.com>

src/liboslcomp/osllex.l

@@ -397,15 +397,6 @@ OSLCompilerImpl::osl_parse_buffer (const std::string &preprocessed_buffer)
     // Thread safety with the lexer/parser
     std::lock_guard<std::mutex> lock(oslcompiler_mutex);
 
-#ifndef OIIO_STRUTIL_HAS_STOF
-    // Force classic "C" locale for correct '.' decimal parsing.
-    // N.B. This is not safe in a multi-threaded program where another
-    // application thread is expecting the native locale to work properly.
-    // This is not necessary for versions of OIIO that have Strutil::stof,
-    // and we can remove it entirely when OIIO 1.9 is the minimum.
-    std::locale oldlocale = std::locale::global (std::locale::classic());
-#endif
-
     yyscan_t scanner;
     yylex_init(&scanner);
     YY_BUFFER_STATE buffer = yy_scan_string(preprocessed_buffer.c_str(), scanner);
@@ -415,9 +406,6 @@ OSLCompilerImpl::osl_parse_buffer (const std::string &preprocessed_buffer)
     yy_delete_buffer (buffer, scanner);
     yylex_destroy(scanner);
 
-#ifndef OIIO_STRUTIL_HAS_STOF
-    std::locale::global (oldlocale);  // Restore the original locale.
-#endif
     return parseerr;
 }
 

src/liboslexec/osolex.l

@@ -288,7 +288,8 @@ public:
     }
 
     // TODO: This is really the only part of parsing that needs the lock still.
-    //       But the calling code setting locale complicates this.
+    //       The calling code no longer sets the global locale, so it would
+    //       likely be simple to clean this up.
     //
     bool parse(OSOReader* reader, const char* what) {
         yy_switch_to_buffer(m_buffer, m_scanner);
@@ -310,12 +311,6 @@ OSOReader::parse_file (const std::string &filename)
     // can actually be reading a .oso file at a time.
     std::lock_guard<std::mutex> guard (osoread_mutex);
 
-    // Force classic "C" locale for correct '.' decimal parsing.
-    // N.B. This is not safe in a multi-threaded program where another
-    // application thread is expecting the native locale to work properly.
-    std::locale oldlocale;   // save the previous native locale
-    std::locale::global (std::locale::classic());
-
     FILE* osoin = OIIO::Filesystem::fopen (filename, "r");
     if (! osoin) {
         m_err.errorfmt("File {} not found", filename);
@@ -326,7 +321,6 @@ OSOReader::parse_file (const std::string &filename)
     bool ok = scope.parse(this, filename.c_str());
 
     fclose (osoin);
-    std::locale::global (oldlocale);  // Restore the original locale.
 
     return ok;
 }
@@ -339,22 +333,9 @@ OSOReader::parse_memory (const std::string &buffer)
     // can actually be reading a .oso file at a time.
     std::lock_guard<std::mutex> guard (osoread_mutex);
 
-#ifndef OIIO_STRUTIL_HAS_STOF
-    // Force classic "C" locale for correct '.' decimal parsing.
-    // N.B. This is not safe in a multi-threaded program where another
-    // application thread is expecting the native locale to work properly.
-    // This is not necessary for versions of OIIO that have Strutil::stof,
-    // and we can remove it entirely when OIIO 1.9 is the minimum.
-    std::locale oldlocale = std::locale::global (std::locale::classic());
-#endif
-
     Scope scope(buffer);
     bool ok = scope.parse(this, "preloaded OSO code");
 
-#ifndef OIIO_STRUTIL_HAS_STOF
-    std::locale::global (oldlocale);  // Restore the original locale.
-#endif
-
     return ok;
 }