Just put everything new in. Conflict resolution will be later

1 files changed, 4 insertions, 1 deletions

diff --git a/faceapi/utils.h b/faceapi/utils.h
index 1fdb35b5..5d25e9a7 100644
--- a/faceapi/utils.h
+++ b/faceapi/utils.h
@@ -2,6 +2,8 @@
 #define SM_API_TESTAPPCONSOLE_UTILS_H

 

 #include "lock.h"

+#include <exception>

+#include <iostream>

 

 #define THROW_ON_ERROR(x) \

 { \

@@ -10,7 +12,8 @@
     { \

         std::stringstream s; \

         s << "API error code: " << result; \

-        throw std::runtime_error(s.str()); \

+        std::cerr << s; \

+        throw std::exception(); \

     } \

 }