Merge insp20

2 files changed, 9 insertions, 1 deletions

diff --git a/include/base.h b/include/base.h
index 117ffab76..c6d361576 100644
--- a/include/base.h
+++ b/include/base.h
@@ -121,7 +121,7 @@ class CoreExport usecountbase
 };
 
 template <typename T>
-class CoreExport reference
+class reference
 {
 	T* value;
  public:
diff --git a/include/socketengine.h b/include/socketengine.h
index 8e4c3dfc9..d97c0ea9f 100644
--- a/include/socketengine.h
+++ b/include/socketengine.h
@@ -493,6 +493,14 @@ public:
 	 * Checks EAGAIN and WSAEWOULDBLOCK
 	 */
 	static bool IgnoreError();
+
+	/** Return the last socket related error. strrerror(errno) on *nix
+	 */
+	static std::string LastError();
+
+	/** Returns the error for the given error num, strerror(errnum) on *nix
+	 */
+	static std::string GetError(int errnum);
 };
 
 inline bool SocketEngine::IgnoreError()