renaming costfunction convenience headers to avoid naming conflict on…

… windows. (#11)
ethz-adrl · May 2, 2019 · 5bdce9f · 5bdce9f
1 parent 0af7ff9
commit 5bdce9f
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/...optcon/costfunction/costfunction-impl.hpp → ...e/ct/optcon/costfunction/costfun-impl.hpp b/...optcon/costfunction/costfunction-impl.hpp → ...e/ct/optcon/costfunction/costfun-impl.hpp
diff --git a/...e/ct/optcon/costfunction/costfunction.hpp → ...nclude/ct/optcon/costfunction/costfun.hpp b/...e/ct/optcon/costfunction/costfunction.hpp → ...nclude/ct/optcon/costfunction/costfun.hpp
diff --git a/ct_optcon/include/ct/optcon/optcon-prespec.h b/ct_optcon/include/ct/optcon/optcon-prespec.h
@@ -8,8 +8,8 @@ Licensed under Apache2 license (see LICENSE file in main directory)
 
 #include <ct/core/core-prespec.h>
 
-#include "costfunction/costfunction.hpp"
-#include "costfunction/costfunction-impl.hpp"  //temporary solution (todo)
+#include "costfunction/costfun.hpp"
+#include "costfunction/costfun-impl.hpp"  //temporary solution (todo)
 
 #include "filter/filter.h"
 #include "filter/filter-impl.h"  //temporary solution (todo)

diff --git a/ct_optcon/include/ct/optcon/optcon.h b/ct_optcon/include/ct/optcon/optcon.h
@@ -8,7 +8,7 @@ Licensed under Apache2 license (see LICENSE file in main directory)
 
 #include <ct/core/core.h>
 
-#include "costfunction/costfunction.hpp"
+#include "costfunction/costfun.hpp"
 
 #include "constraint/constraint.h"
 
@@ -49,7 +49,7 @@ Licensed under Apache2 license (see LICENSE file in main directory)
 #include "filter/filter.h"
 
 // implementations
-#include "costfunction/costfunction-impl.hpp"
+#include "costfunction/costfun-impl.hpp"
 
 #include "constraint/constraint-impl.h"