Skip to content

Fix compiler and linker warnings #1605

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
betatim wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Fix compiler and linker warnings #1605

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
51a24d6
Fix compiler and linker warnings
betatim Feb 1, 2017
d4f356a
Merge branch 'master' into fix/compiler-warnings
standage Feb 25, 2017
4247f9e
Merge branch 'master' into fix/compiler-warnings
standage Apr 27, 2017
2396a51
Merge branch "master"
standage Jul 27, 2017
80b32b6
Merge branch 'master' into fix/compiler-warnings
standage Sep 14, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'])
Expand Down
4 changes: 2 additions & 2 deletions src/oxli/assembler.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ namespace oxli
********************************/

LinearAssembler::LinearAssembler(const Hashgraph * ht) :
graph(ht), _ksize(ht->ksize())
_ksize(ht->ksize()), graph(ht)
{

}
Expand Down Expand Up @@ -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<uint64_t> table_sizes = graph->get_tablesizes();
junctions = new Countgraph(_ksize, table_sizes);
Expand Down
2 changes: 1 addition & 1 deletion src/oxli/traversal.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ namespace oxli
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++) {
Expand Down