Fix compiler and linker warnings

dib-lab · Feb 20, 2017 · 51a24d6 · 51a24d6
1 parent b2ab515
commit 51a24d6
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/khmer/_khmer.cc b/khmer/_khmer.cc
@@ -4004,7 +4004,7 @@ linearassembler_assemble(khmer_KLinearAssembler_Object * me,
  khmer_KNodegraph_Object * nodegraph_o = NULL;
  Nodegraph * stop_bf = NULL;
  const char * dir_str = NULL;
- char dir = NULL;
+ char dir = '\0';
 
  const char *kwnames[] = {"seed_kmer", "stop_filter", "direction", NULL};
 

diff --git a/lib/assembler.cc b/lib/assembler.cc
@@ -50,7 +50,7 @@ namespace khmer
  ********************************/
 
 LinearAssembler::LinearAssembler(const Hashgraph * ht) :
- graph(ht), _ksize(ht->ksize())
+ _ksize(ht->ksize()), graph(ht)
 {
 
 }
@@ -334,7 +334,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<uint64_t> table_sizes = graph->get_tablesizes();
  junctions = new Countgraph(_ksize, table_sizes);

diff --git a/lib/traversal.cc b/lib/traversal.cc
@@ -52,7 +52,7 @@ namespace khmer
 template <bool direction>
 NodeGatherer<direction>::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++) {

diff --git a/setup.py b/setup.py
@@ -152,6 +152,9 @@ def check_for_openmp():
  # force 64bit only builds
  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'])