Merge "actually ET_ALL is the 26th (ET_NEGTEST_CONFL needs to get its own settings)"

core/Encdec.cc

@@ -56,6 +56,7 @@ TTCN_EncDec::default_error_behavior[TTCN_EncDec::ET_ALL] = {
   TTCN_EncDec::EB_IGNORE,
   TTCN_EncDec::EB_WARNING,
   TTCN_EncDec::EB_ERROR,
+  TTCN_EncDec::EB_ERROR,
   TTCN_EncDec::EB_ERROR
 };
 
@@ -85,6 +86,7 @@ TTCN_EncDec::error_behavior[TTCN_EncDec::ET_ALL] = {
   TTCN_EncDec::EB_IGNORE,
   TTCN_EncDec::EB_WARNING,
   TTCN_EncDec::EB_ERROR,
+  TTCN_EncDec::EB_ERROR,
   TTCN_EncDec::EB_ERROR
 };
 

core/Encdec.hh

@@ -104,7 +104,7 @@ public:
     ET_OMITTED_TAG,   /**< During encoding the key of a tag references
                            an optional field with omitted value */
     ET_NEGTEST_CONFL, /**< Contradictory negative testing and RAW attributes. */
-    ET_ALL,           /**< Used only when setting error behavior. 25 */
+    ET_ALL,           /**< Used only when setting error behavior. 26 */
     ET_INTERNAL,      /**< Internal error. Error behavior cannot be set
                            for this. */
     ET_NONE           /**< There was no error. */