Remove unnecessary includes from epicsException.h

Fix up byteBuffer.h and epicsException.cpp to match.
This commit is contained in:
Andrew Johnson
2016-02-05 13:43:13 -06:00
parent c3d7fa0d26
commit 3fadc9b481
3 changed files with 6 additions and 8 deletions

View File

@@ -10,6 +10,7 @@
#include <sstream>
#include <cstdio>
#include <cstring>
#include <cstdlib>
#include <string>
#define epicsExportSharedSymbols
@@ -50,7 +51,7 @@ ExceptionMixin::show() const
out<<symbols[i]<<"\n";
}
free(symbols);
std::free(symbols);
}
#endif

View File

@@ -11,7 +11,8 @@
#define BYTEBUFFER_H
#include <string>
#include <string.h>
#include <cstring>
#include <cstdlib>
#ifdef epicsExportSharedSymbols
#define byteBufferepicsExportSharedSymbols
@@ -224,7 +225,7 @@ public:
* Must be one of EPICS_BYTE_ORDER,EPICS_ENDIAN_LITTLE,EPICS_ENDIAN_BIG.
*/
ByteBuffer(std::size_t size, int byteOrder = EPICS_BYTE_ORDER) :
_buffer((char*)malloc(size)), _size(size),
_buffer((char*)std::malloc(size)), _size(size),
_reverseEndianess(byteOrder != EPICS_BYTE_ORDER),
_reverseFloatEndianess(byteOrder != EPICS_FLOAT_WORD_ORDER),
_wrapped(false)
@@ -257,7 +258,7 @@ public:
*/
~ByteBuffer()
{
if (_buffer && !_wrapped) free(_buffer);
if (_buffer && !_wrapped) std::free(_buffer);
}
/**
* Set the byte order.

View File

@@ -40,12 +40,8 @@
#include <stdexcept>
#include <string>
#include <cstdio>
#include <stdio.h>
#include <stdlib.h>
#include <shareLib.h>
// Users may redefine this for a large size if desired