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: 823680daa130
Choose a base ref
...
head repository: ngscopeclient/scopehal
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e6be84b27bf0
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Mar 4, 2020

  1. LeCroyOscilloscope should not inherit base classes virtually

    @azonenberg
    azonenberg committed Mar 4, 2020
    Copy the full SHA
    e6be84b View commit details
Showing with 3 additions and 3 deletions.
  1. +3 −3 scopehal/LeCroyOscilloscope.h
6 changes: 3 additions & 3 deletions scopehal/LeCroyOscilloscope.h
View file
Original file line number Diff line number Diff line change
@@ -39,9 +39,9 @@
Protocol layer is based on LeCroy's released VICPClient.h, but rewritten and modernized heavily
*/
class LeCroyOscilloscope
: public virtual Oscilloscope
, public virtual Multimeter
, public virtual FunctionGenerator
: public Oscilloscope
, public Multimeter
, public FunctionGenerator
{
public:
LeCroyOscilloscope(std::string hostname, unsigned short port);