Kaynağa Gözat

HPCC-15767 Fix incorrect mismerge (out of date parameter)

Signed-off-by: Gavin Halliday <gavin.halliday@lexisnexis.com>
Gavin Halliday 8 yıl önce
ebeveyn
işleme
385736abc4
1 değiştirilmiş dosya ile 1 ekleme ve 1 silme
  1. 1 1
      ecl/hql/hqlutil.cpp

+ 1 - 1
ecl/hql/hqlutil.cpp

@@ -5807,7 +5807,7 @@ IHqlExpression * extractCppBodyAttrs(unsigned lenBuffer, const char * buffer)
                     i = end;
                     if(matchOption(start, end, buffer, 4, "pure", false, valueStart, valueEnd))
                         attrs.setown(createComma(attrs.getClear(), createAttribute(pureAtom)));
-                    else if (matchOption(start, lenBuffer, buffer, 8, "volatile", false, valueStart, valueEnd))
+                    else if (matchOption(start, end, buffer, 8, "volatile", false, valueStart, valueEnd))
                         attrs.setown(createComma(attrs.getClear(), createAttribute(volatileAtom)));
                     else if (matchOption(start, end, buffer, 4, "costly", false, valueStart, valueEnd))
                         attrs.setown(createComma(attrs.getClear(), createAttribute(costlyAtom)));