use std::exception in callback

apache · Sep 16, 2019 · 5261f05 · 5261f05
1 parent 5ed5689
commit 5261f05
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/include/mxnet/engine.h b/include/mxnet/engine.h
@@ -74,15 +74,15 @@ class CallbackOnComplete {
  public:
   // use implicit copy and assign
   /*! \brief involve the callback */
-  inline void operator()(const dmlc::Error* error = nullptr) const {
+  inline void operator()(const std::exception* error = nullptr) const {
     (*callback_)(engine_, param_, error);
   }
 
  private:
   /*! \brief engine can see content of callback */
   friend class ::mxnet::Engine;
   /*! \brief the real callback */
-  void (*callback_)(Engine *, void *, const dmlc::Error *);
+  void (*callback_)(Engine*, void*, const std::exception*);
   /*! \brief the engine class passed to callback */
   Engine* engine_;
   /*! \brief the parameter set on callback */
@@ -279,7 +279,7 @@ class MXNET_API Engine {
    * \param param the paramter passed to callback.
    */
   inline CallbackOnComplete CreateCallback(
-      void (*callback)(Engine *, void *, const dmlc::Error *), void *param) {
+      void (*callback)(Engine*, void*, const std::exception*), void* param) {
     CallbackOnComplete ret;
     ret.callback_ = callback;
     ret.engine_ = this;

diff --git a/src/engine/naive_engine.cc b/src/engine/naive_engine.cc
@@ -233,8 +233,8 @@ class NaiveEngine final : public Engine {
 
  private:
   // callback to oncomplete
-  static void OnComplete(Engine *engine, void *param,
-                         const dmlc::Error* error) {
+  static void OnComplete(Engine* engine, void* param,
+                         const std::exception* error) {
     bool *req_completed = static_cast<bool*>(param);
     *req_completed = true;
   }

diff --git a/src/engine/threaded_engine.cc b/src/engine/threaded_engine.cc
@@ -507,8 +507,8 @@ void ThreadedEngine::Throw(VarHandle var) {
   ThrowException(threaded_var);
 }
 
-void ThreadedEngine::OnCompleteStatic(Engine *engine, void *opr_block_,
-                                      const dmlc::Error* error) {
+void ThreadedEngine::OnCompleteStatic(Engine* engine, void* opr_block_,
+                                      const std::exception* error) {
   OprBlock *opr_block = static_cast<OprBlock*>(opr_block_);
   ThreadedOpr *threaded_opr = opr_block->opr;
   if (error != nullptr) {

diff --git a/src/engine/threaded_engine.h b/src/engine/threaded_engine.h
@@ -489,8 +489,8 @@ class ThreadedEngine : public Engine {
     }
   }
 
-  static void OnCompleteStatic(Engine *engine, void *threaded_opr,
-                               const dmlc::Error* error);
+  static void OnCompleteStatic(Engine* engine, void* threaded_opr,
+                               const std::exception* error);
   /*!
    * \brief find exception in global_exception_refs and add it if missing
    * \param opr_exception the exception to be added to global_exception_refs