Merge branch 'master' of https://github.com/real-logic/simple-binary-encoding

Author: tmontgomery

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

@@ -55,17 +55,22 @@ class IrDecoder
  {
  }
 
- int decode(char *buffer, int length)
+ int decode(char *buffer, std::uint64_t length)
  {
+ m_length = length;
  return decodeIr();
  }
 
  int decode(const char *filename)
  {
- if ((m_length = getFileSize(filename)) < 0)
+ long fileSize = getFileSize(filename);
+
+ if (fileSize < 0)
  {
  return -1;
  }
+
+ m_length = static_cast<std::uint64_t>(fileSize);
  std::cout << "IR Filename " << filename << " length " << m_length << std::endl;
  if (m_length == 0)
  {
@@ -124,10 +129,10 @@ class IrDecoder
  return fileStat.st_size;
  }
 
- static int readFileIntoBuffer(char *buffer, const char *filename, int length)
+ static int readFileIntoBuffer(char *buffer, const char *filename, std::uint64_t length)
  {
  FILE *fptr = ::fopen(filename, "rb");
- int remaining = length;
+ std::uint64_t remaining = length;
 
  if (fptr == NULL)
  {
@@ -154,13 +159,13 @@ class IrDecoder
  std::shared_ptr<std::vector<Token>> m_headerTokens;
  std::vector<std::shared_ptr<std::vector<Token>>> m_messages;
  std::unique_ptr<char[]> m_buffer;
- long m_length;
+ std::uint64_t m_length;
  int m_id;
 
  int decodeIr()
  {
  FrameCodec frame;
- int offset = 0, tmpLen = 0;
+ std::uint64_t offset = 0, tmpLen = 0;
  char tmp[256];
 
  frame.wrapForDecode(m_buffer.get(), offset, frame.sbeBlockLength(), frame.sbeSchemaVersion(), m_length);
@@ -177,11 +182,11 @@ class IrDecoder
  frame.getNamespaceName(tmp, sizeof(tmp));
  frame.getSemanticVersion(tmp, sizeof(tmp));
 
- offset += frame.size();
+ offset += frame.encodedLength();
 
  m_headerTokens.reset(new std::vector<Token>());
 
- int headerLength = readHeader(offset);
+ std::uint64_t headerLength = readHeader(offset);
 
  m_id = frame.irId();
 
@@ -195,7 +200,7 @@ class IrDecoder
  return 0;
  }
 
- int decodeAndAddToken(std::shared_ptr<std::vector<Token>> tokens, int offset)
+ std::uint64_t decodeAndAddToken(std::shared_ptr<std::vector<Token>> tokens, std::uint64_t offset)
  {
  TokenCodec tokenCodec;
  tokenCodec.wrapForDecode(m_buffer.get(), offset, tokenCodec.sbeBlockLength(), tokenCodec.sbeSchemaVersion(), m_length);
@@ -210,7 +215,7 @@ class IrDecoder
  std::int32_t version = tokenCodec.tokenVersion();
  std::int32_t componentTokenCount = tokenCodec.componentTokenCount();
  char tmpBuffer[256];
- int tmpLen = 0;
+ std::uint64_t tmpLen = 0;
 
  tmpLen = tokenCodec.getName(tmpBuffer, sizeof(tmpBuffer));
  std::string name(tmpBuffer, static_cast<std::size_t>(tmpLen));
@@ -251,12 +256,12 @@ class IrDecoder
 
  tokens->push_back(token);
 
- return tokenCodec.size();
+ return tokenCodec.encodedLength();
  }
 
- int readHeader(int offset)
+ std::uint64_t readHeader(std::uint64_t offset)
  {
- int size = 0;
+ std::uint64_t size = 0;
 
  while (offset + size < m_length)
  {
@@ -280,9 +285,9 @@ class IrDecoder
  return size;
  }
 
- int readMessage(int offset)
+ std::uint64_t readMessage(std::uint64_t offset)
  {
- int size = 0;
+ std::uint64_t size = 0;
 
  std::shared_ptr<std::vector<Token>> tokensForMessage(new std::vector<Token>());
 

sbe-tool/src/main/cpp/uk_co_real_logic_sbe_ir_generated/ByteOrderCodec.h

@@ -18,6 +18,7 @@
 # include <cstdint>
 # include <functional>
 # include <string>
+# include <cstring>
 #endif
 
 #include <sbe/sbe.h>
@@ -32,12 +33,12 @@ class ByteOrderCodec
 
  enum Value 
  {
- SBE_LITTLE_ENDIAN = (sbe_uint8_t)0,
- SBE_BIG_ENDIAN = (sbe_uint8_t)1,
- NULL_VALUE = (sbe_uint8_t)255
+ SBE_LITTLE_ENDIAN = (std::uint8_t)0,
+ SBE_BIG_ENDIAN = (std::uint8_t)1,
+ NULL_VALUE = (std::uint8_t)255
  };
 
- static ByteOrderCodec::Value get(const sbe_uint8_t value)
+ static ByteOrderCodec::Value get(const std::uint8_t value)
  {
  switch (value)
  {