vbox的更動 36523 路徑 trunk/include

時間撮記:

2011-4-4 下午12:40:10 (14 年 以前)

作者:

vboxsync

訊息:

Renamed iprt::Error to RTCError.

位置:

trunk/include/iprt/cpp

檔案:

• exception.h (修改) (2 筆差異)
• xml.h (修改) (2 筆差異)

trunk/include/iprt/cpp/exception.h

@@ -28 +28 @@
 
 #include <iprt/cpp/ministring.h>
-
-namespace iprt
-{
+#include <exception>
 
 /** @defgroup grp_rt_cpp_exceptions     C++ Exceptions
@@ -41 +39 @@
  * The XML exceptions are based on this.
  */
-class RT_DECL_CLASS Error
+class RT_DECL_CLASS RTCError
     : public std::exception
 {
 public:
 
-    Error(const char *pcszMessage)
-        : m_s(pcszMessage)
+    RTCError(const char *pszMessage)
+        : m_strMsg(pszMessage)
     {
     }
 
-    Error(const iprt::MiniString &s)
-        : m_s(s)
+    RTCError(const iprt::MiniString &a_rstrMessage)
+        : m_strMsg(a_rstrMessage)
     {
     }
 
-    Error(const Error &s)
-        : std::exception(s),
-          m_s(s.what())
+    RTCError(const RTCError &a_rSrc)
+        : std::exception(a_rSrc),
+          m_strMsg(a_rSrc.what())
     {
     }
 
-    virtual ~Error() throw()
+    virtual ~RTCError() throw()
     {
     }
 
-    void operator=(const Error &s)
+    void operator=(const RTCError &a_rSrc)
     {
-        m_s = s.what();
+        m_strMsg = a_rSrc.what();
     }
 
-    void setWhat(const char *pcszMessage)
+    void setWhat(const char *a_pszMessage)
     {
-        m_s = pcszMessage;
+        m_strMsg = a_pszMessage;
     }
 
-    virtual const char* what() const throw()
+    virtual const char *what() const throw()
     {
-        return m_s.c_str();
+        return m_strMsg.c_str();
     }
 
 private:
-    /* Hide the default constructor to make sure the extended one above is
-       always used. */
-    Error();
+    /**
+     * Hidden default constructor making sure that the extended one above is
+     * always used.
+     */
+    RTCError();
 
-    iprt::MiniString m_s;
+    /** The exception message. */
+    iprt::MiniString m_strMsg;
 };
 
 /** @} */
 
-} /* namespace iprt */
-
 #endif
 

trunk/include/iprt/cpp/xml.h

@@ -65 +65 @@
 //////////////////////////////////////////////////////////////////////////////
 
-class RT_DECL_CLASS LogicError : public iprt::Error
+class RT_DECL_CLASS LogicError : public RTCError
 {
 public:
 
     LogicError(const char *aMsg = NULL)
-        : iprt::Error(aMsg)
+        : RTCError(aMsg)
     {}
 
@@ -76 +76 @@
 };
 
-class RT_DECL_CLASS RuntimeError : public iprt::Error
+class RT_DECL_CLASS RuntimeError : public RTCError
 {
 public:
 
     RuntimeError(const char *aMsg = NULL)
-        : iprt::Error(aMsg)
+        : RTCError(aMsg)
     {}
 };