diff --git a/setup.py b/setup.py index ca4ecbb181..2f7f10ac3e 100755 --- a/setup.py +++ b/setup.py @@ -181,6 +181,8 @@ def build_dir(): EXTRA_COMPILE_ARGS.extend(['-arch', 'x86_64', '-mmacosx-version-min=10.7', '-stdlib=libc++']) EXTRA_LINK_ARGS.append('-mmacosx-version-min=10.7') + EXTRA_LINK_ARGS.append('-stdlib=libc++') + if check_for_openmp(): EXTRA_COMPILE_ARGS.extend(['-fopenmp']) diff --git a/src/oxli/assembler.cc b/src/oxli/assembler.cc index cf79c6deb5..7740e81443 100644 --- a/src/oxli/assembler.cc +++ b/src/oxli/assembler.cc @@ -50,7 +50,7 @@ namespace oxli ********************************/ LinearAssembler::LinearAssembler(const Hashgraph * ht) : - graph(ht), _ksize(ht->ksize()) + _ksize(ht->ksize()), graph(ht) { } @@ -344,7 +344,7 @@ const ***************************************/ JunctionCountAssembler::JunctionCountAssembler(Hashgraph * ht) : - graph(ht), _ksize(ht->ksize()), traverser(ht), linear_asm(ht) + linear_asm(ht), traverser(ht), graph(ht), _ksize(ht->ksize()) { std::vector table_sizes = graph->get_tablesizes(); junctions = new Countgraph(_ksize, table_sizes); diff --git a/src/oxli/traversal.cc b/src/oxli/traversal.cc index e3befe17c6..54f14099b2 100644 --- a/src/oxli/traversal.cc +++ b/src/oxli/traversal.cc @@ -52,7 +52,7 @@ namespace oxli template NodeGatherer::NodeGatherer(const Hashgraph * ht, KmerFilterList filters) : - KmerFactory(ht->ksize()), graph(ht), filters(filters) + KmerFactory(ht->ksize()), filters(filters), graph(ht) { bitmask = 0; for (unsigned int i = 0; i < _ksize; i++) {