Changeset 1612 for XIOS/dev/dev_olga/src/exception.cpp

Timestamp:

11/23/18 14:48:14 (5 years ago)

Author:

oabramkina

Message:

Dev: adding exception handling.

To activate it, compilation flag -DXIOS_EXCEPTION should be added.

File:

• XIOS/dev/dev_olga/src/exception.cpp (modified) (2 diffs)

XIOS/dev/dev_olga/src/exception.cpp

@@ -5 +5 @@
 #include "client.hpp"
 #include "server.hpp"
-#include "cxios.hpp"
 #include "log.hpp"
 
@@ -12 +11 @@
   /// ////////////////////// Définitions ////////////////////// ///
    CException::CException(void)
-      : CObject(), desc_rethrow(true)
+      : CObject(), desc_rethrow(true), stream()
    { /* Ne rien faire de plus */ }
 
-   CException::CException(const StdString & id)
-      : CObject(id), desc_rethrow(true)
+   CException::CException(const std::string & id)
+      : CObject(id), desc_rethrow(true), stream()
    { /* Ne rien faire de plus */ }
 
    CException::CException(const CException & exception)
-      : std::basic_ios<char>()
-      , CObject(exception.getId())
-      , StdOStringStream()
-      , desc_rethrow(false)
+//      : std::basic_ios<char>()
+       : CObject(exception.getId())
+//      , StdOStringStream()
+//      , desc_rethrow(false)
    { (*this) << exception.str(); }
 
    CException::~CException(void)
    {
-      if (desc_rethrow)
-#ifdef __XIOS_NOABORT
-      {
-        throw (*this);
-      }
-#else
-     {
-      error << this->getMessage() << std::endl;
-      MPI_Abort(CXios::globalComm, -1); //abort();
-      }
-#endif
+//      if (desc_rethrow)
+//#ifdef __XIOS_NOABORT
+//      {
+//        throw (*this);
+//      }
+//#else
+//     {
+//      error << this->getMessage() << std::endl;
+//        throw 4;
+//      MPI_Abort(CXios::globalComm, -1); //abort();
+//      }
+//#endif
    }
 
    //---------------------------------------------------------------
 
-   StdString CException::getMessage(void) const
+   std::string CException::getMessage(void) const
    {
-      StdOStringStream oss;
-      oss << "> Error [" << this->getId() << "] : " << this->str();
-      return (oss.str());
+//     StdOStringStream oss;
+//     oss << "> Error [" << this->getId() << "] : " << this->str();
+//     return (oss.str());
+     return (stream.str());
    }
 
    StdOStringStream &  CException::getStream(void)
-   { return (*boost::polymorphic_cast<StdOStringStream*>(this)); }
+//   { return (*boost::polymorphic_cast<StdOStringStream*>(this)); }
+   { return stream; }
 
-   StdString CException::toString(void) const
-   { return (StdString(this->getMessage())); }
+   std::string CException::toString(void) const
+//   { return (std::string(this->getMessage())); }
+   { return stream.str(); }
 
-   void CException::fromString(const StdString & str)
-   { this->str(str); }
+   void CException::fromString(const std::string & str)
+   { }
+//   { this->str(str); }
 
    //---------------------------------------------------------------