fixed pure function and cpp flags

diff --git a/ForceModel.cpp b/ForceModel.cpp
index 4a96f5e273259aeab55c95da722fbd07bf2ef2ce..d41c91850c0d2d77962fada049bc7f9208b35a6f 100644 (file)
--- a/ForceModel.cpp
+++ b/ForceModel.cpp
@@ -4,8 +4,3 @@ ForceModel::ForceModel()
 : _lastpos(0.0), _lastforce(0.0)//, _lastspeed(0.0)
 {
 }
-
-float ForceModel::computeForce(float pos)
-{
-  return 0.0;
-}
\ No newline at end of file

diff --git a/ForceModel.h b/ForceModel.h
index 86f1e9d2d7b6b22e51e9876d88ea9cec61de44bd..ea01cf40500122cc0d91faacb412fcfd5a98cd7b 100644 (file)
--- a/ForceModel.h
+++ b/ForceModel.h
@@ -4,7 +4,7 @@ class ForceModel {
   public:
     virtual ~ForceModel() {}
 
-    virtual float computeForce(float pos);
+    virtual float computeForce(float pos) = 0;
 
   protected:
     ForceModel();

diff --git a/Makefile b/Makefile
index 87287d5bcc6ddbad0c9e0fd762382bc9bb4ac077..c599275aaad2eae0eb03642c39793635892b0a9f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -26,9 +26,6 @@ TARGET_INCLUDES = include
 
 include $(ROOTDIR)/common.mk
 
-TARGET_CXX += -std=c++11
-#TARGET_LD = $(TOOLCHAIN)-g++
-
 all: uC-sdk $(TARGET)
 
 clean: clean-generic