[Spice-devel] [PATCH spice-streaming-agent] Remove usage of ERROR macro

Frediano Ziglio fziglio at redhat.com
Tue Feb 20 12:13:22 UTC 2018


Use more simple syntax for throwing errors.

Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
---
 src/mjpeg-fallback.cpp | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/mjpeg-fallback.cpp b/src/mjpeg-fallback.cpp
index cf704c6..fd37167 100644
--- a/src/mjpeg-fallback.cpp
+++ b/src/mjpeg-fallback.cpp
@@ -19,12 +19,6 @@
 
 using namespace spice::streaming_agent;
 
-#define ERROR(args) do { \
-    std::ostringstream _s; \
-    _s << args; \
-    throw std::runtime_error(_s.str()); \
-} while(0)
-
 static inline uint64_t get_time()
 {
     timespec now;
@@ -65,7 +59,7 @@ MjpegFrameCapture::MjpegFrameCapture(const MjpegSettings& settings):
 {
     dpy = XOpenDisplay(NULL);
     if (!dpy)
-        ERROR("Unable to initialize X11");
+        throw std::runtime_error("Unable to initialize X11");
 }
 
 MjpegFrameCapture::~MjpegFrameCapture()
-- 
2.14.3



More information about the Spice-devel mailing list