Fix g++ 8.3.0 compilation error

- Fix a syntax allowed in g++ 7.2.1 (PSDK5.3) but not in 8.3.0 (PSDK6.0)
- Make should report error from loop
- MCT-1199

diff --git a/examples/Makefile b/examples/Makefile
index 52b3ff6508b233093e8ff3b83a20f9b473351146..9217380d00d1c235dcc66307193f77c7b87bf8b6 100644 (file)
--- a/examples/Makefile
+++ b/examples/Makefile
@@ -34,7 +34,7 @@ RUN_DIRS := $(filter-out classification, $(DIRS))
 define make_in_dirs
        @for dir in $(1); do \
          echo "=============== " $$dir " =================" ; \
-         $(MAKE) --no-print-directory $(MAKEFILE) -C $$dir $(2); \
+         $(MAKE) --no-print-directory $(MAKEFILE) -C $$dir $(2) || exit 1; \
        done
 endef
 

diff --git a/examples/classification/main.cpp b/examples/classification/main.cpp
index 020004bb2263322e3660f9ebf05274ec66402e03..25361f8a210a1de37c37a3030d6d3bfc55adf988 100644 (file)
--- a/examples/classification/main.cpp
+++ b/examples/classification/main.cpp
@@ -699,7 +699,7 @@ int tf_postprocess(uchar *in, int size, int roi_idx, int frame_idx, int f_id)
   int rpt_id = -1;
 
   typedef std::pair<uchar, int> val_index;
-  auto constexpr cmp = [](val_index &left, val_index &right) { return left.first > right.first; };
+  auto cmp = [](val_index &left, val_index &right) { return left.first > right.first; };
   std::priority_queue<val_index, std::vector<val_index>, decltype(cmp)> queue(cmp);
   // initialize priority queue with smallest value on top
   for (int i = 0; i < k; i++) {

diff --git a/examples/imagenet/main.cpp b/examples/imagenet/main.cpp
index 937f4671fdb2bda3099d4c3e6874bf8853d4296c..dc1035be9442a76b567bb994be12c1e6ace5e632 100644 (file)
--- a/examples/imagenet/main.cpp
+++ b/examples/imagenet/main.cpp
@@ -309,7 +309,7 @@ bool WriteFrameOutput(const ExecutionObjectPipeline &eop,
 
     // sort and get k largest values and corresponding indices
     typedef pair<unsigned char, int> val_index;
-    auto constexpr cmp = [](val_index &left, val_index &right)
+    auto cmp = [](val_index &left, val_index &right)
                          { return left.first > right.first; };
     priority_queue<val_index, vector<val_index>, decltype(cmp)> queue(cmp);
     // initialize priority queue with smallest value on top