From 07885819e3c547dd9a25a9f52d0b48965e21d747 Mon Sep 17 00:00:00 2001
From: Danny Robson <danny@nerdcruft.net>
Date: Wed, 9 Sep 2015 18:39:36 +1000
Subject: [PATCH] except: add expect conditions for try_code

---
 except.cpp     | 8 +++-----
 net/except.cpp | 6 ++----
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/except.cpp b/except.cpp
index 5625e04e..07ed1ff3 100644
--- a/except.cpp
+++ b/except.cpp
@@ -60,7 +60,7 @@ errno_error::try_code (void)
 void
 errno_error::try_code (int code)
 {
-    if (code != 0)
+    if (__builtin_expect (code != 0, false))
         throw errno_error(code);
 }
 
@@ -117,10 +117,8 @@ win32_error::try_code (void)
 void
 win32_error::try_code (DWORD id)
 {
-    if (id == ERROR_SUCCESS)
-        return;
-
-    throw_code (id);
+    if (__builtin_expect (id != ERROR_SUCCESS, false))
+        throw_code (id);
 }
 
 
diff --git a/net/except.cpp b/net/except.cpp
index 0ac211c5..d224c49b 100644
--- a/net/except.cpp
+++ b/net/except.cpp
@@ -89,10 +89,8 @@ net::error::throw_code (void)
 //-----------------------------------------------------------------------------
 void
 net::error::try_code (int err) {
-    if (err == 0)
-        return;
-
-    throw_code (err);
+    if (__builtin_expect (err != 0, false))
+        throw_code (err);
 }