small fixes for modern compilers

feodor · feodor · commit ef6ac735d06f · 2022-06-02T01:27:33.000+03:00
diff --git a/Makefile b/Makefile
@@ -65,13 +65,13 @@ endif
 
 # compiler settings
 PKG_CONFIG = pkg-config
-override CPPFLAGS += $(shell $(PKG_CONFIG) --cflags healpix_cxx)
-SHLIB_LINK += $(shell $(PKG_CONFIG) --libs healpix_cxx)
-LINK.shared = g++ -shared
+override CPPFLAGS += $(shell $(PKG_CONFIG) --cflags healpix_cxx ) -fopenmp
+SHLIB_LINK = $(shell $(PKG_CONFIG) --libs healpix_cxx) -fopenmp
+LINK.shared = $(CXX) -shared
 
 # healpix_bare.c isn't ours so we refrain from fixing the warnings in there
 healpix_bare/healpix_bare.o : healpix_bare/healpix_bare.c
-	$(COMPILE.c) -Wno-declaration-after-statement -o $@ $^
+	$(COMPILE.c) -fopenmp -Wno-declaration-after-statement -o $@ $^
 
 # experimental for spoint3
 pg_version := $(word 2,$(shell $(PG_CONFIG) --version))
diff --git a/process_moc.cpp b/process_moc.cpp
@@ -15,6 +15,7 @@
 #include <cxxabi.h> /* __cxa_current_exception_type */
 
 #include <healpix_base.h>
+#include <healpix_cxx/error_handling.h>
 
 #include "pgs_process_moc.h"
 #include "pgs_util.h"
@@ -575,7 +576,7 @@ create_moc_release_context(void* moc_in_context, Smoc* moc,
 		// the above level-end values stay correct.
 
 		// process the interval pages
-		hpint64	order_log = 0;
+		//hpint64	order_log = 0;
 		rintv_iter	i(moc_data, m.layout[0].level_end);
 		rnode_iter	n(moc_data, m.layout[1].level_end);
 		// default for "empty" root node, points past the intervals:
@@ -590,8 +591,8 @@ create_moc_release_context(void* moc_in_context, Smoc* moc,
 		{
 			first	= r->first;
 			last	= r->second;
-			order_log |= first;
-			order_log |= last;
+			//order_log |= first;
+			//order_log |= last;
 			area += last - first;
 			if (i.page_ready())
 			{
