Merge pull request #166 from mortehu/master

Prevent accidental bool conversion of AutoCloseFd.

Merge pull request #166 from mortehu/master
Prevent accidental bool conversion of AutoCloseFd.
3ce6f4af · Kenton Varda · 50d356a0 · 6f97afa7 · 3ce6f4af
Commit 3ce6f4af authored Jan 06, 2015 by Kenton Varda
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

io.h c++/src/kj/io.h +4 -0

No files found.
--- a/c++/src/kj/io.h
+++ b/c++/src/kj/io.h
@@ -257,6 +257,10 @@ public:
  inline operator int() const { return fd; }
  inline int get() const { return fd; }

+  operator bool() const = delete;
+  // Deleting this operator prevents accidental use in boolean contexts, which
+  // the int conversion operator above would otherwise allow.
+
  inline bool operator==(decltype(nullptr)) { return fd < 0; }
  inline bool operator!=(decltype(nullptr)) { return fd >= 0; }