Skip to content
Snippets Groups Projects
Commit 68a392fb authored by Wuttke, Joachim's avatar Wuttke, Joachim
Browse files

Merge branch 'devel'

parents ab8d1a9b 83a34ba2
No related branches found
No related tags found
No related merge requests found
### first of all, check whether all tests pass
cd /G/f2/pub
mi
ctest -j7
cd /G/f2
git checkout master
git pull origin master
......@@ -56,8 +61,8 @@ mkdir build
cd build
cmake ..
m -j7
ctest -j7
mi
ctest -j7
### upload man page (if changed)
......
......@@ -8,7 +8,7 @@ set(CMAKE_DISABLE_IN_SOURCE_BUILD ON)
project(Frida)
set(Frida_VERSION 2.4.0c)
set(Frida_VERSION post-2.4.0c)
include(CTest) # equivalent to "enable_testing() ???
add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND}) # => 'make check' is an alias for 'ctest'
......
......@@ -47,8 +47,8 @@ class CObjNum : public CObj
public:
CObjNum() : CObj() {}
bool is_vec() const { return false; }
// virtual double to_dr() const { return 0.; }
// virtual double to_dr(int i) const { return 0.; }
virtual double to_dr() const { return 0.; }
virtual double to_dr(int i) const { return 0.; }
virtual RObjVecNum to_vec(int repetitions) const = 0;
};
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment