efd356f3dc1b54a6801fdaffa9fc4d5e9d5d96f9 jcasper Mon May 13 13:42:39 2019 -0700 Quick fix to avoid namespace collision, pending better handling of straw version numbers, refs #18842 diff --git src/hg/lib/straw/straw.cpp src/hg/lib/straw/straw.cpp index bf58d41..4626f37 100644 --- src/hg/lib/straw/straw.cpp +++ src/hg/lib/straw/straw.cpp @@ -56,31 +56,31 @@ of data, and outputs as text in sparse upper triangular format. Currently only supporting matrices. Usage: straw [:x1:x2] [:y1:y2] */ // this is for creating a stream from a byte array for ease of use struct membuf : std::streambuf { membuf(char* begin, char* end) { this->setg(begin, begin, end); } }; // version number -int version; +static int version; // map of block numbers to pointers map blockMap; long total_bytes; // get a buffer that can be used as an input stream from the URL char* getHttpData(char *url, long position, long chunksize) { char *buffer = (char*) malloc(chunksize); if (buffer == NULL) { throw strawException("Out of memory (malloc returned NULL)"); } struct udcFile *udc = udcFileMayOpen(url, NULL); if (udc == NULL)