[C++] Formatting.

Author: mjpt777

sbe-tool/src/main/cpp/otf/IrDecoder.h

@@ -43,8 +43,7 @@
 
 using namespace sbe::otf;
 
-namespace sbe {
-namespace otf {
+namespace sbe { namespace otf {
 
 class IrDecoder
 {
@@ -158,7 +157,7 @@ class IrDecoder
  int fd = fileno(fptr);
  while (remaining > 0)
  {
- long sz = ::read(fd, buffer + (length - remaining), (4098 < remaining) ? 4098 : remaining);
+ long sz = ::read(fd, buffer + (length - remaining), 4098 < remaining ? 4098 : remaining);
  remaining -= sz;
  if (sz < 0)
  {
@@ -168,7 +167,7 @@ class IrDecoder
 
  fclose(fptr);
 
- return (remaining == 0) ? 0 : -1;
+ return remaining == 0 ? 0 : -1;
  }
 
 private:
@@ -272,8 +271,7 @@ class IrDecoder
  type, presence, byteOrder, minValue, maxValue, nullValue, constValue,
  characterEncoding, epoch, timeUnit, semanticType);
 
- Token token(
- tokenOffset, id, version, tokenSize, componentTokenCount, signal, name, description, encoding);
+ Token token(tokenOffset, id, version, tokenSize, componentTokenCount, signal, name, description, encoding);
 
  tokens->push_back(token);
 

sbe-tool/src/main/cpp/otf/OtfMessageDecoder.h

@@ -23,9 +23,7 @@
 
 using namespace sbe::otf;
 
-namespace sbe {
-namespace otf {
-namespace OtfMessageDecoder {
+namespace sbe { namespace otf { namespace OtfMessageDecoder {
 
 typedef std::function<void(Token& token)> on_begin_message_t;
 
@@ -279,7 +277,6 @@ std::size_t decodeData(
  throw std::runtime_error("length too short for data length field");
  }
 
- // TODO: is length always unsigned according to spec?
  std::uint64_t dataLength = isPresent ?
  lengthToken.encoding().getAsUInt(buffer + bufferIndex + lengthToken.offset()) : 0;
 

sbe-tool/src/main/cpp/otf/Token.h

@@ -21,8 +21,7 @@
 
 #include "Encoding.h"
 
-namespace sbe {
-namespace otf {
+namespace sbe { namespace otf {
 
 /// Constants used for holding Token signals
 enum class Signal : int
@@ -78,8 +77,7 @@ class Token
  Signal signal,
  std::string name,
  std::string description,
- Encoding encoding)
- :
+ Encoding encoding) :
  m_offset(offset),
  m_fieldId(fieldId),
  m_version(version),