diff options
Diffstat (limited to 'lib/common/makeexception.pl.in')
-rwxr-xr-x | lib/common/makeexception.pl.in | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/common/makeexception.pl.in b/lib/common/makeexception.pl.in index 76b9b02b..593740da 100755 --- a/lib/common/makeexception.pl.in +++ b/lib/common/makeexception.pl.in @@ -191,7 +191,11 @@ unsigned int ${class}Exception::GetSubType() const throw() const char *${class}Exception::what() const throw() { #ifdef EXCEPTION_CODENAMES_EXTENDED +<<<<<<< HEAD if(mSubType < 0 || mSubType > (sizeof(whats) / sizeof(whats[0]))) +======= + if(mSubType > (sizeof(whats) / sizeof(whats[0]))) +>>>>>>> 0.12 { return "${class}"; } |