From: Francis Dupont <fdupont@isc.org>
Date: Sat, 13 Jun 2015 16:33:08 +0000 (+0200)
Subject: [3899] Fixed the IFACEMGR_ERROR macros bugs
X-Git-Tag: trac3919_base~6^2~23
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7d18bd4a78c1f6cfbf11172e145b79bd426575f6;p=thirdparty%2Fkea.git

[3899] Fixed the IFACEMGR_ERROR macros bugs
---

diff --git a/src/lib/dhcp/iface_mgr_error_handler.h b/src/lib/dhcp/iface_mgr_error_handler.h
index c5ef5b401b..4b1d832ee4 100644
--- a/src/lib/dhcp/iface_mgr_error_handler.h
+++ b/src/lib/dhcp/iface_mgr_error_handler.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2014, 2015 Internet Systems Consortium, Inc. ("ISC")
 //
 // Permission to use, copy, modify, and/or distribute this software for any
 // purpose with or without fee is hereby granted, provided that the above
@@ -40,12 +40,12 @@
 /// @param stream stream object holding an error string.
 #define IFACEMGR_ERROR(ex_type, handler, stream) \
 { \
-    std::ostringstream oss__; \
-    oss__ << stream; \
+    std::ostringstream ieoss__; \
+    ieoss__ << stream; \
     if (handler) { \
-        handler(oss__.str()); \
+        handler(ieoss__.str()); \
     } else { \
-        isc_throw(ex_type, oss__); \
+        isc_throw(ex_type, ieoss__.str()); \
     } \
 } \