Skip to content

Commit

Permalink
Merge pull request #888 from sstsimulator/devel
Browse files Browse the repository at this point in the history
Automatically Merged using SST Master Branch Merger
  • Loading branch information
sst-autotester authored Nov 29, 2022
2 parents 41d2df9 + 750983e commit a8bb2e0
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 2 deletions.
3 changes: 3 additions & 0 deletions external/tinyxml/tinyxmlparser.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -111,14 +111,17 @@ void TiXmlBase::ConvertUTF32ToUTF8( unsigned long input, char* output, int* leng
--output;
*output = (char)((input | BYTE_MARK) & BYTE_MASK);
input >>= 6;
/* fall through */
case 3:
--output;
*output = (char)((input | BYTE_MARK) & BYTE_MASK);
input >>= 6;
/* fall through */
case 2:
--output;
*output = (char)((input | BYTE_MARK) & BYTE_MASK);
input >>= 6;
/* fall through */
case 1:
--output;
*output = (char)(input | FIRST_BYTE_MARK[*length]);
Expand Down
2 changes: 1 addition & 1 deletion src/sst/core/config.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1168,7 +1168,7 @@ Config::parseCmdLine(int argc, char* argv[])

case 'h':
helper.clean_exit = true;

/* fall through */
default:
ok = helper.usage();
}
Expand Down
2 changes: 1 addition & 1 deletion src/sst/core/serialization/serialize_deque.h
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ class serialize<std::deque<T>>
size_t size;
ser.unpack(size);
for ( size_t i = 0; i < size; ++i ) {
T t;
T t = {};
serialize<T>()(t, ser);
v.push_back(t);
}
Expand Down

0 comments on commit a8bb2e0

Please sign in to comment.