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: NixOS/nix
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e5319a87ce75
Choose a base ref
...
head repository: NixOS/nix
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4e840fc5410b
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Oct 30, 2019

  1. minor: fix mismatch of struct/class forward decl of 'Source' 

    Fixes the following warning and the indicate potential issue:

src/libstore/worker-protocol.hh:66:1: warning: class 'Source' was previously declared as a struct; this is valid, but may result in linker errors
under the Microsoft C++ ABI [-Wmismatched-tags]

(cherry picked from commit 6e1bb04870b1b723282d32182af286646f13bf3c)
    @dtzWill
    dtzWill committed Oct 30, 2019
    Copy the full SHA
    0e9b72e View commit details

Commits on Oct 31, 2019

  1. Merge pull request #3179 from dtzWill/fix/struct-class-mismatch-minor 

    minor: fix mismatch of struct/class forward decl of 'Source'
    @edolstra
    edolstra authored Oct 31, 2019
    Copy the full SHA
    4e840fc View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 src/libstore/worker-protocol.hh
2 changes: 1 addition & 1 deletion src/libstore/worker-protocol.hh
View file
Original file line number Diff line number Diff line change
@@ -63,7 +63,7 @@ typedef enum {


class Store;
class Source;
struct Source;

Path readStorePath(Store & store, Source & from);
template<class T> T readStorePaths(Store & store, Source & from);