Merge pull request #60932 from c0bw3b/patches-cleanup
[treewide] delete (some) unused patches
This commit is contained in:
@@ -1,11 +0,0 @@
|
||||
--- a/SConscript
|
||||
+++ b/SConscript
|
||||
@@ -99,7 +99,7 @@
|
||||
elif platform == "Windows" and not GetOption('msvc'):
|
||||
env = Environment(tools=['mingw'], ENV={'PATH' : os.environ['PATH']})
|
||||
else:
|
||||
- env = Environment(tools=['default'], ENV={'PATH' : os.environ['PATH']})
|
||||
+ env = Environment(tools=['default'], ENV = os.environ)
|
||||
|
||||
#attempt to automatically find cross compiler
|
||||
if not tool and compilePlatform == "Linux" and compilePlatform != platform:
|
||||
@@ -1,14 +0,0 @@
|
||||
diff --git a/src/Trigger/main.cpp b/src/Trigger/main.cpp
|
||||
index 39539e1..680c12c 100644
|
||||
--- a/src/Trigger/main.cpp
|
||||
+++ b/src/Trigger/main.cpp
|
||||
@@ -890,7 +890,8 @@ bool MainApp::loadAll()
|
||||
std::smatch mr; // Match Results
|
||||
std::regex pat(R"(^(\w+)(\..+)$)"); // Pattern
|
||||
|
||||
- if (!std::regex_search(std::string(*fname), mr, pat))
|
||||
+ std::string search(*fname);
|
||||
+ if (!std::regex_search(search, mr, pat))
|
||||
continue;
|
||||
|
||||
std::string basefname = mr[1];
|
||||
Reference in New Issue
Block a user