Do not use TR namespace for supported features in the standard library

2 files changed, 11 insertions, 11 deletions

diff --git a/common/DSUtilLite/locale.cpp b/common/DSUtilLite/locale.cpp
index 9f431652..2f68fbaf 100644
--- a/common/DSUtilLite/locale.cpp
+++ b/common/DSUtilLite/locale.cpp
@@ -612,9 +612,9 @@ std::string ProbeForISO6392(LPCSTR lang)
   } else if (strlen(lang) > 3) {
     isoLang = LanguageToISO6392(lang);
     if (isoLang.empty()) {
-      std::tr1::regex ogmRegex("\\[([[:alpha:]]{3})\\]");
-      std::tr1::cmatch res;
-      bool found = std::tr1::regex_search(lang, res, ogmRegex);
+      std::regex ogmRegex("\\[([[:alpha:]]{3})\\]");
+      std::cmatch res;
+      bool found = std::regex_search(lang, res, ogmRegex);
       if (found && !res[1].str().empty()) {
         isoLang = ISO6392Check(res[1].str().c_str());
       }
diff --git a/demuxer/LAVSplitter/LAVSplitter.cpp b/demuxer/LAVSplitter/LAVSplitter.cpp
index e5fe0d59..4cf7ae21 100644
--- a/demuxer/LAVSplitter/LAVSplitter.cpp
+++ b/demuxer/LAVSplitter/LAVSplitter.cpp
@@ -1490,15 +1490,15 @@ std::list<CSubtitleSelector> CLAVSplitter::GetSubtitleSelectors()
   // Add the "off" termination element
   tokenList.push_back("*:off");
 
-  std::tr1::regex advRegex(
-                            "(?:(\\*|[[:alpha:]]+):)?"        // audio language
-                            "(\\*|[[:alpha:]]+)"              // subtitle language
-                            "(?:\\|(!?)([fdnh]+))?"           // flags
-                            "(?:@([^" + separators + "]+))?"  // subtitle track name substring
-                          );
+  std::regex advRegex(
+                      "(?:(\\*|[[:alpha:]]+):)?"        // audio language
+                      "(\\*|[[:alpha:]]+)"              // subtitle language
+                      "(?:\\|(!?)([fdnh]+))?"           // flags
+                      "(?:@([^" + separators + "]+))?"  // subtitle track name substring
+                    );
   for (const std::string& token : tokenList) {
-    std::tr1::cmatch res;
-    bool found = std::tr1::regex_search(token.c_str(), res, advRegex);
+    std::cmatch res;
+    bool found = std::regex_search(token.c_str(), res, advRegex);
     if (found) {
       CSubtitleSelector selector;
       selector.audioLanguage = res[1].str().empty() ? "*" : ProbeForISO6392(res[1].str().c_str());