Skip to content

Commit 422017a

Browse files
committed
Fix more warnings from boost
1 parent b8a11d7 commit 422017a

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/emc/kinematics/Submakefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ USERSRCS += $(GENSERKINSSRCS)
77

88
DELTAMODULESRCS := emc/kinematics/lineardeltakins.cc
99
PYSRCS += $(DELTAMODULESRCS)
10-
$(call TOOBJS, $(DELTAMODULESRCS)): CFLAGS += -x c++ -Wno-declaration-after-statement
10+
$(call TOOBJS, $(DELTAMODULESRCS)): EXTRAFLAGS += -DBOOST_ALLOW_DEPRECATED_HEADERS=1 -DBOOST_BIND_GLOBAL_PLACEHOLDERS=1
1111

1212
DELTAMODULE := ../lib/python/lineardeltakins.so
1313
$(DELTAMODULE): $(call TOOBJS, $(DELTAMODULESRCS))
@@ -27,7 +27,7 @@ TARGETS += ../bin/genserkins
2727

2828
RDELTAMODULESRCS := emc/kinematics/rotarydeltakins.cc
2929
PYSRCS += $(RDELTAMODULESRCS)
30-
$(call TOOBJS, $(RDELTAMODULESRCS)): CFLAGS += -x c++ -Wno-declaration-after-statement
30+
$(call TOOBJS, $(RDELTAMODULESRCS)): EXTRAFLAGS += -DBOOST_ALLOW_DEPRECATED_HEADERS=1 -DBOOST_BIND_GLOBAL_PLACEHOLDERS=1
3131

3232
RDELTAMODULE := ../lib/python/rotarydeltakins.so
3333
$(RDELTAMODULE): $(call TOOBJS, $(RDELTAMODULESRCS))

src/emc/rs274ngc/Submakefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ LIBRS274SRCS := $(addprefix emc/rs274ngc/, \
3636
interp_inspection.cc)
3737
USERSRCS += $(LIBRS274SRCS)
3838

39-
$(call TOOBJSDEPS, emc/rs274ngc/pyparamclass.cc emc/rs274ngc/pyinterp1.cc emc/rs274ngc/pyblock.cc emc/rs274ngc/pyarrays.cc emc/rs274ngc/interpmodule.cc): EXTRAFLAGS += -DBOOST_ALLOW_DEPRECATED_HEADERS=1
40-
$(call TOOBJSDEPS, $(LIBRS274SRCS)) : EXTRAFLAGS=-fPIC $(BOOST_DEBUG_FLAGS)
39+
$(call TOOBJSDEPS, $(LIBRS274SRCS)) : EXTRAFLAGS+=-fPIC $(BOOST_DEBUG_FLAGS)
40+
$(call TOOBJSDEPS, emc/rs274ngc/pyinterp1.cc emc/rs274ngc/pyparamclass.cc emc/rs274ngc/pyinterp1.cc emc/rs274ngc/pyblock.cc emc/rs274ngc/pyarrays.cc emc/rs274ngc/interpmodule.cc): EXTRAFLAGS += -DBOOST_ALLOW_DEPRECATED_HEADERS=1 -DBOOST_BIND_GLOBAL_PLACEHOLDERS=1
4141

4242
TARGETS += ../lib/librs274.so ../lib/librs274.so.0
4343

0 commit comments

Comments
 (0)