diff options
| author | Jaron Kent-Dobias <jaron@kent-dobias.com> | 2018-07-26 01:50:39 -0400 |
|---|---|---|
| committer | Jaron Kent-Dobias <jaron@kent-dobias.com> | 2018-07-26 01:50:39 -0400 |
| commit | 215c40813a35c4fdc0bb5f1b8fdea125b9e9d2e4 (patch) | |
| tree | 9ae07162fcd8932b01bb5bdbde8fd75d3b8d9e72 /lib/measure.h | |
| parent | de8c6398f269c9fa14842c170b5b21651e817f9b (diff) | |
| download | c++-215c40813a35c4fdc0bb5f1b8fdea125b9e9d2e4.tar.gz c++-215c40813a35c4fdc0bb5f1b8fdea125b9e9d2e4.tar.bz2 c++-215c40813a35c4fdc0bb5f1b8fdea125b9e9d2e4.zip | |
a couple more removed files
Diffstat (limited to 'lib/measure.h')
| -rw-r--r-- | lib/measure.h | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/lib/measure.h b/lib/measure.h index 0b86309..8082dd2 100644 --- a/lib/measure.h +++ b/lib/measure.h @@ -1,7 +1,9 @@ #pragma once -#include "measurement.h" +#include "state.h" +#include "correlation.h" +#include <functional> #define POSSIBLE_MEASUREMENTS 4 const unsigned char measurement_energy = 1 << 0; @@ -11,14 +13,6 @@ const unsigned char measurement_fourierZero = 1 << 3; char const *measurement_labels[] = {"E", "S", "M", "F"}; -#ifdef __cplusplus - -#include "state.h" -#include "correlation.h" -#include <functional> - - - FILE **measure_setup_files(unsigned char flags, unsigned long timestamp) { FILE **files = (FILE **)calloc(POSSIBLE_MEASUREMENTS, sizeof(FILE *)); @@ -66,6 +60,4 @@ void measure_free_files(unsigned char flags, FILE **files) { free(files); } -#endif - |