Merge branch 'master' into c_standalone_compilation_test_07-23

2019-07-30 14:35:46 +03:00
parent be44354b33 62100b1140
commit b7c5274f45
6 changed files with 55 additions and 37 deletions
--- a/include/astaroth_defines.h
+++ b/include/astaroth_defines.h
@@ -95,7 +95,14 @@ typedef struct {

 typedef enum { AC_SUCCESS = 0, AC_FAILURE = 1 } AcResult;

-typedef enum { RTYPE_MAX, RTYPE_MIN, RTYPE_RMS, RTYPE_RMS_EXP, NUM_REDUCTION_TYPES } ReductionType;
+typedef enum {
+    RTYPE_MAX,
+    RTYPE_MIN,
+    RTYPE_RMS,
+    RTYPE_RMS_EXP,
+    RTYPE_SUM,
+    NUM_REDUCTION_TYPES
+} ReductionType;

 typedef enum {
    STREAM_DEFAULT,