ummahusla

# overwrite master with contents of feature branch (feature > master)
git checkout feature      # source name
git merge -s ours master  # target name
git checkout master       # target name
git merge feature         # source name

drbobbeaty

#include <string>
#include <strings.h>
#include <stdint.h>

std::string hexDump( zmq::message_t & aMessage ) {
  // I'm going to build a hex/ascii dump like you've seen so many times before
  std::string  msg;
  std::string  ascii;
  // get the pointer to the start of the message's payload - and it's size
  char *buff = (char *)aMessage.data();