Changeset 680 for XIOS/trunk/src/type/enum_ref_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_ref_impl.hpp (modified) (9 diffs)

XIOS/trunk/src/type/enum_ref_impl.hpp

@@ -160 +160 @@
     
     ERROR("template <typename T> void CEnum_ref<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());
   }
   
@@ -178 +178 @@
     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_ref<T>::_toBuffer(CBufferOut& buffer) const",
-               <<"incompatibility between enumeration and standard integer type") ;
+    else ERROR("template <typename T> bool CEnum_ref<T>::_toBuffer(CBufferOut& buffer) const",
+               << "incompatibility between enumeration and standard integer type.");
     return false ;
   }
@@ -206 +206 @@
       if (ret) *ptrValue = (T_enum) val ;
     }
-    else ERROR("template <typename T>  bool CEnum_ref<T>::_fromBuffer(CBufferIn& buffer)",
-               <<"incompatibility between enumeration and standard integer type") ;
+    else ERROR("template <typename T> bool CEnum_ref<T>::_fromBuffer(CBufferIn& buffer)",
+               << "incompatibility between enumeration and standard integer type.");
     return ret ;
   }
@@ -234 +234 @@
       if (ret) *ptrValue = (T_enum) val ;
     }
-    else ERROR("template <typename T>  bool CEnum_ref<T>::_fromBuffer(CBufferIn& buffer)",
-               <<"incompatibility between enumeration and standard integer type") ;
+    else ERROR("template <typename T> bool CEnum_ref<T>::_fromBuffer(CBufferIn& buffer)",
+               << "incompatibility between enumeration and standard integer type");
   }
  
@@ -260 +260 @@
   {
     if (empty) ERROR("template <typename T> void CEnum_ref<T>::checkEmpty(void)",
-                     <<"Type_ref reference is not assigned") ;
+                     << "Enum reference is not initialized.") ;
   }
                      
@@ -269 +269 @@
   {
     if (!type.toBuffer(buffer)) ERROR("template <typename T> CBufferOut& operator<<(CBufferOut& buffer, const CEnum_ref<T>& type)",
-                                           <<"Buffer remain size is to low for size type") ;
+                                      << "Not enough free space in buffer to queue the enum.");
     return buffer ;
   }
@@ -277 +277 @@
   {
     if (!CEnum_ref<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 ;
   }
@@ -284 +284 @@
   CBufferIn& operator>>(CBufferIn& buffer, typename T::t_enum& type)
   {
-    if (! CEnum_ref<T>(type).fromBuffer(buffer)) ERROR("template <typename T>  CBufferIn& operator>>(CBufferIn& buffer, typename T::t_enum& type)",
-                                                       <<"Buffer remain size is to low for size type") ;
+    if (!CEnum_ref<T>(type).fromBuffer(buffer)) ERROR("template <typename T>  CBufferIn& operator>>(CBufferIn& buffer, typename T::t_enum& type)",
+                                                      << "Not enough data in buffer to unqueue the enum.");
     return buffer ;
   }
@@ -292 +292 @@
   CBufferIn& operator>>(CBufferIn& buffer, const CEnum_ref<T>& type)
   {
-    if (! type.fromBuffer(buffer) ) ERROR("  template <typename T> CBufferIn& operator>>(CBufferIn& buffer, const CEnum_ref<T>& type) ",
-                                           <<"Buffer remain size is to low for size type") ;
+    if (!type.fromBuffer(buffer)) ERROR("template <typename T> CBufferIn& operator>>(CBufferIn& buffer, const CEnum_ref<T>& type) ",
+                                        << "Not enough data in buffer to unqueue the enum.");
+    return buffer ;
     return buffer ;
   }