Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ngscopeclient/scopehal-apps
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: ceeaaf5480e1
Choose a base ref
...
head repository: ngscopeclient/scopehal-apps
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 83a500dae677
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Sep 30, 2020

  1. Copy the full SHA
    ebe35a7 View commit details
  2. Merge pull request #202 from bvernoux/master

    Fix FileSystem.cpp build error with MSYS2 MinGW 64-bit
    nshcat authored Sep 30, 2020
    Copy the full SHA
    83a500d View commit details
Showing with 4 additions and 6 deletions.
  1. +4 −6 src/glscopeclient/FileSystem.cpp
10 changes: 4 additions & 6 deletions src/glscopeclient/FileSystem.cpp
Original file line number Diff line number Diff line change
@@ -13,14 +13,12 @@
#include <stdio.h>
#endif


using namespace std;


vector<string> Glob(const string& pathPattern, bool onlyDirectories)
{
vector<string> result{ };
vector<string> result{ };

#ifdef _WIN32
WIN32_FIND_DATA findData{ };
HANDLE fileSearch{ };
@@ -29,7 +27,7 @@ vector<string> Glob(const string& pathPattern, bool onlyDirectories)
pathPattern.c_str(),
FindExInfoStandard,
&findData,
onlyDirectories ? FindExSearchLimitToDirectories : 0,
onlyDirectories ? FindExSearchLimitToDirectories : FindExSearchNameMatch,
NULL,
0
);
@@ -45,7 +43,7 @@ vector<string> Glob(const string& pathPattern, bool onlyDirectories)

if(!onlyDirectories || (findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY))
{
results.push_back(string{dir});
result.push_back(string{dir});
}
}
}