From 3fadc9b481f8f17db94603e2289e64d8ce6c2ca6 Mon Sep 17 00:00:00 2001
From: Andrew Johnson <anj@aps.anl.gov>
Date: Fri, 5 Feb 2016 13:43:13 -0600
Subject: [PATCH] Remove unnecessary includes from epicsException.h

Fix up byteBuffer.h and epicsException.cpp to match.
---
 src/misc/epicsException.cpp  | 3 ++-
 src/misc/pv/byteBuffer.h     | 7 ++++---
 src/misc/pv/epicsException.h | 4 ----
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/misc/epicsException.cpp b/src/misc/epicsException.cpp
index 48f59b8..e29b649 100644
--- a/src/misc/epicsException.cpp
+++ b/src/misc/epicsException.cpp
@@ -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
diff --git a/src/misc/pv/byteBuffer.h b/src/misc/pv/byteBuffer.h
index 945c80b..f20d475 100644
--- a/src/misc/pv/byteBuffer.h
+++ b/src/misc/pv/byteBuffer.h
@@ -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.
diff --git a/src/misc/pv/epicsException.h b/src/misc/pv/epicsException.h
index e60709a..55982c1 100644
--- a/src/misc/pv/epicsException.h
+++ b/src/misc/pv/epicsException.h
@@ -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