Skip to content

Commit d2d21ff

Browse files
authored
demos/cpp: replace IE_ASSERT (#3502) (#3527)
1 parent 63da995 commit d2d21ff

File tree

5 files changed

+12
-9
lines changed

5 files changed

+12
-9
lines changed

demos/pedestrian_tracker_demo/cpp/include/logging.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66

77
#include <details/ie_exception.hpp>
88

9-
#define PT_CHECK(cond) IE_ASSERT(cond) << " "
9+
#define PT_CHECK(cond) CV_Assert(cond);
1010

1111
#define PT_CHECK_BINARY(actual, expected, op) \
12-
IE_ASSERT(actual op expected) << ". " << actual << " vs " << expected << ". "
12+
CV_Assert(actual op expected);
1313

1414
#define PT_CHECK_EQ(actual, expected) PT_CHECK_BINARY(actual, expected, ==)
1515
#define PT_CHECK_NE(actual, expected) PT_CHECK_BINARY(actual, expected, !=)

demos/smart_classroom_demo/cpp/include/logger.hpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,10 @@ class DetectionsLogger {
4949
};
5050

5151

52-
#define SCR_CHECK(cond) IE_ASSERT(cond) << " "
52+
#define SCR_CHECK(cond) CV_Assert(cond);
5353

5454
#define SCR_CHECK_BINARY(actual, expected, op) \
55-
IE_ASSERT(actual op expected) << ". " \
56-
<< actual << " vs " << expected << ". "
55+
CV_Assert(actual op expected);
5756

5857
#define SCR_CHECK_EQ(actual, expected) SCR_CHECK_BINARY(actual, expected, ==)
5958
#define SCR_CHECK_NE(actual, expected) SCR_CHECK_BINARY(actual, expected, !=)

demos/smart_classroom_demo/cpp/main.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,9 @@ std::map<int, int> GetMapFaceTrackIdToLabel(const std::vector<Track>& face_track
384384

385385
auto cur_obj_id = first_obj.object_id;
386386
auto cur_label = first_obj.label;
387-
SCR_CHECK(face_track_id_to_label.count(cur_obj_id) == 0) << " Repeating face tracks";
387+
if (face_track_id_to_label.count(cur_obj_id) == 1) {
388+
throw std::runtime_error("Repeating face tracks");
389+
}
388390
face_track_id_to_label[cur_obj_id] = cur_label;
389391
}
390392
return face_track_id_to_label;

demos/smart_classroom_demo/cpp_gapi/include/logger.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,10 @@ class DetectionsLogger {
6666
std::map<int, int> GetMapFaceTrackIdToLabel(const std::vector<Track>& face_tracks);
6767
};
6868

69-
#define SCR_CHECK(cond) IE_ASSERT(cond) << " "
69+
#define SCR_CHECK(cond) CV_Assert(cond);
7070

7171
#define SCR_CHECK_BINARY(actual, expected, op) \
72-
IE_ASSERT(actual op expected) << ". " << actual << " vs " << expected << ". "
72+
CV_Assert(actual op expected);
7373

7474
#define SCR_CHECK_EQ(actual, expected) SCR_CHECK_BINARY(actual, expected, ==)
7575
#define SCR_CHECK_NE(actual, expected) SCR_CHECK_BINARY(actual, expected, !=)

demos/smart_classroom_demo/cpp_gapi/src/logger.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,9 @@ std::map<int, int> DetectionsLogger::GetMapFaceTrackIdToLabel(const std::vector<
269269

270270
auto cur_obj_id = first_obj.object_id;
271271
auto cur_label = first_obj.label;
272-
SCR_CHECK(face_track_id_to_label.count(cur_obj_id) == 0) << " Repeating face tracks";
272+
if (face_track_id_to_label.count(cur_obj_id) == 1) {
273+
throw std::runtime_error("Repeating face tracks");
274+
}
273275
face_track_id_to_label[cur_obj_id] = cur_label;
274276
}
275277
return face_track_id_to_label;

0 commit comments

Comments
 (0)