Commitef6ac73

committed

small fixes for modern compilers

1 parent3a7f241 commitef6ac73Copy full SHA for ef6ac73

File tree

-7

lines changed

-7

lines changed

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -65,13 +65,13 @@ endif`
`65`	`65`
`66`	`66`	`# compiler settings`
`67`	`67`	`PKG_CONFIG = pkg-config`
`68`		`-overrideCPPFLAGS +=$(shell$(PKG_CONFIG) --cflags healpix_cxx)`
`69`		`-SHLIB_LINK+=$(shell$(PKG_CONFIG) --libs healpix_cxx)`
`70`		`-LINK.shared =g++ -shared`
	`68`	`+overrideCPPFLAGS +=$(shell$(PKG_CONFIG) --cflags healpix_cxx ) -fopenmp`
	`69`	`+SHLIB_LINK =$(shell$(PKG_CONFIG) --libs healpix_cxx) -fopenmp`
	`70`	`+LINK.shared =$(CXX) -shared`
`71`	`71`
`72`	`72`	`# healpix_bare.c isn't ours so we refrain from fixing the warnings in there`
`73`	`73`	`healpix_bare/healpix_bare.o : healpix_bare/healpix_bare.c`
`74`		`-$(COMPILE.c) -Wno-declaration-after-statement -o$@$^`
	`74`	`+$(COMPILE.c) -fopenmp -Wno-declaration-after-statement -o$@$^`
`75`	`75`
`76`	`76`	`# experimental for spoint3`
`77`	`77`	`pg_version :=$(word 2,$(shell$(PG_CONFIG) --version))`

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@`
`15`	`15`	`#include<cxxabi.h>/* __cxa_current_exception_type*/`
`16`	`16`
`17`	`17`	`#include<healpix_base.h>`
	`18`	`+#include<healpix_cxx/error_handling.h>`
`18`	`19`
`19`	`20`	`#include"pgs_process_moc.h"`
`20`	`21`	`#include"pgs_util.h"`
`@@ -575,7 +576,7 @@ create_moc_release_context(void* moc_in_context, Smoc* moc,`
`575`	`576`	`// the above level-end values stay correct.`
`576`	`577`
`577`	`578`	`// process the interval pages`
`578`		`-hpint64order_log =0;`
	`579`	`+//hpint64order_log = 0;`
`579`	`580`	`rintv_iteri(moc_data, m.layout[0].level_end);`
`580`	`581`	`rnode_itern(moc_data, m.layout[1].level_end);`
`581`	`582`	`// default for "empty" root node, points past the intervals:`
`@@ -590,8 +591,8 @@ create_moc_release_context(void* moc_in_context, Smoc* moc,`
`590`	`591`	`{`
`591`	`592`	`first= r->first;`
`592`	`593`	`last= r->second;`
`593`		`-order_log \|= first;`
`594`		`-order_log \|= last;`
	`594`	`+//order_log \|= first;`
	`595`	`+//order_log \|= last;`
`595`	`596`	`area += last - first;`
`596`	`597`	`if (i.page_ready())`
`597`	`598`	`{`

Comments

(0)