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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 079c789b1e34
Choose a base ref
...
head repository: ngscopeclient/scopehal
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 68be468c6282
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Sep 24, 2020

  1. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    95c1ed9 View commit details

Commits on Sep 25, 2020

  1. Merge pull request #266 from bvernoux/patch-2

    Refactor basename() to string_base_name()
    azonenberg authored Sep 25, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    68be468 View commit details
Showing with 6 additions and 1 deletion.
  1. +6 −1 scopeprotocols/DeEmbedFilter.cpp
7 changes: 6 additions & 1 deletion scopeprotocols/DeEmbedFilter.cpp
Original file line number Diff line number Diff line change
@@ -33,6 +33,11 @@

using namespace std;

inline std::string string_base_name(std::string const & path)
{
return path.substr(path.find_last_of("/\\") + 1);
}

////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// Construction / destruction

@@ -140,7 +145,7 @@ void DeEmbedFilter::SetDefaultName()
{
if(base != "")
base += ", ";
base += basename(f.c_str());
base += string_base_name(f);
}

char hwname[256];