Changeset 680 for XIOS/trunk/src/type/enum_impl.hpp

Timestamp:

09/01/15 17:15:42 (9 years ago)

Author:

rlacroix

Message:

Rephrase some error messages so that they are clearer.

File:

• XIOS/trunk/src/type/enum_impl.hpp (modified) (7 diffs)

XIOS/trunk/src/type/enum_impl.hpp

@@ -159 +159 @@
     
     ERROR("template <typename T> void CEnum<T>::_fromString(const string& str)",
-    << tmpStr << " cannot be converted in a valid enumeration, possibilities are : "<<strList.str() ) ;
+          << tmpStr << " cannot be converted in a valid enumeration, possibilities are: " << strList.str());
 
   }
@@ -189 +189 @@
     else if (sizeof(*ptrValue)==sizeof(int)) return buffer.put((int) *ptrValue) ;
     else if (sizeof(*ptrValue)==sizeof(long int)) return buffer.put((long int) *ptrValue) ;
-    else ERROR("template <typename T>  bool CEnum<T>::_toBuffer(CBufferOut& buffer) const",
-               <<"incompatibility between enumeration and standard integer type") ;
+    else ERROR("template <typename T> bool CEnum<T>::_toBuffer(CBufferOut& buffer) const",
+               << "incompatibility between enumeration and standard integer type.");
     return false ;
   }
@@ -217 +217 @@
       if (ret) *ptrValue = (T_enum) val ;
     }
-    else ERROR("template <typename T>  bool CEnum<T>::_fromBuffer(CBufferIn& buffer)",
-               <<"incompatibility between enumeration and standard integer type") ;
+    else ERROR("template <typename T> bool CEnum<T>::_fromBuffer(CBufferIn& buffer)",
+               << "incompatibility between enumeration and standard integer type.");
     return ret ;
   }
@@ -246 +246 @@
   void CEnum<T>::checkEmpty(void) const
   {
-    if (empty) ERROR("template <typename T> void CEnum<T>::checkEmpty(void) const", <<"Type is not initialized") ;
+    if (empty) ERROR("template <typename T> void CEnum<T>::checkEmpty(void) const",
+                     << "Enum is not initialized.");
   }  
 
@@ -254 +255 @@
   {
     if (!type.toBuffer(buffer)) ERROR("template <typename T> CBufferOut& operator<<(CBufferOut& buffer, const CEnum<T>& type)",
-                                           <<"Buffer remain size is to low for size type") ;
+                                      << "Not enough free space in buffer to queue the enum.");
     return buffer ;
   }
@@ -262 +263 @@
   {
     if (!CEnum<T>(type).toBuffer(buffer)) ERROR("template <typename T> CBufferOut& operator<<(CBufferOut& buffer, const typename T::t_enum & type)",
-                                           <<"Buffer remain size is to low for size type") ;      
+                                                << "Not enough free space in buffer to queue the enum.");
     return buffer ;
   }
@@ -269 +270 @@
   CBufferIn& operator>>(CBufferIn& buffer, CEnum<T>& type)
   {
-    if (! type.fromBuffer(buffer)) ERROR("template <typename T> CBufferIn& operator>>(CBufferIn& buffer, CEnum<T>& type)",
-                                           <<"Buffer remain size is to low for size type") ;
+    if (!type.fromBuffer(buffer)) ERROR("template <typename T> CBufferIn& operator>>(CBufferIn& buffer, CEnum<T>& type)",
+                                        << "Not enough data in buffer to unqueue the enum.");
     return buffer ;
   }