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/nixpkgs
base: c56b13a06f85
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: dbd9e7fcb285
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Feb 2, 2018

  1. fastjet: Fix build w/clang5 

    https://hydra.nixos.org/build/68588849/nixlog/1

libtool: compile:  clang++ -DHAVE_CONFIG_H -I. -I../../include/fastjet -O2 -Wall -g -Woverloaded-virtual -DDROP_CGAL -I. -I./siscone -I./../../include -I./siscone -c SISConeBasePlugin.cc  -fno-common -DPIC -o .libs/libSISConePlugin_la-SISConeBasePlugin.o
SISConeBasePlugin.cc:12:12: error: no matching member function for call to 'structure_of'
  return a.structure_of<UserScaleBase::StructureType>().ordering_var2()
         ~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
./../../include/fastjet/PseudoJet.hh:1012:60: note: candidate template ignored: substitution failure [with TransformerType = fastjet::SISConeBasePlugin::UserScaleBase::StructureType]: ISO C++ specifies that qualified reference to 'StructureType' is a constructor name rather than a type in this context, despite preceding 'typename' keyword
const typename TransformerType::StructureType & PseudoJet::structure_of() const{
      ~~~~~~~~                                             ^
    @dtzWill
    dtzWill committed Feb 2, 2018
    Copy the full SHA
    8a1069b View commit details
    Browse the repository at this point in the history

Commits on Feb 3, 2018

  1. Merge pull request #34534 from dtzWill/fix/fastjet-clang5 

    fastjet: Fix build w/clang5
    @grahamc
    grahamc committed Feb 3, 2018
    Copy the full SHA
    dbd9e7f View commit details
    Browse the repository at this point in the history