Revert "make `folly::Formatter` extendible"

[folly.git] / folly / Exception.h

diff --git a/folly/Exception.h b/folly/Exception.h
index 7c0665c781df6bc43142130fc4543a20c25120bf..f0547c02545adf2797dba310d5a510a0d914958b 100644 (file)
--- a/folly/Exception.h
+++ b/folly/Exception.h
@@ -23,10 +23,10 @@
 #include <stdexcept>
 #include <system_error>
 
-#include "folly/Conv.h"
-#include "folly/FBString.h"
-#include "folly/Likely.h"
-#include "folly/Portability.h"
+#include <folly/Conv.h>
+#include <folly/FBString.h>
+#include <folly/Likely.h>
+#include <folly/Portability.h>
 
 namespace folly {
 
@@ -37,13 +37,13 @@ namespace folly {
 // The *Explicit functions take an explicit value for errno.
 
 // Helper to throw std::system_error
-void throwSystemErrorExplicit(int err, const char*) FOLLY_NORETURN;
+FOLLY_NORETURN void throwSystemErrorExplicit(int err, const char*);
 inline void throwSystemErrorExplicit(int err, const char* msg) {
   throw std::system_error(err, std::system_category(), msg);
 }
 
 template <class... Args>
-void throwSystemErrorExplicit(int, Args&&... args) FOLLY_NORETURN;
+FOLLY_NORETURN void throwSystemErrorExplicit(int, Args&&... args);
 template <class... Args>
 void throwSystemErrorExplicit(int err, Args&&... args) {
   throwSystemErrorExplicit(
@@ -52,7 +52,7 @@ void throwSystemErrorExplicit(int err, Args&&... args) {
 
 // Helper to throw std::system_error from errno and components of a string
 template <class... Args>
-void throwSystemError(Args&&... args) FOLLY_NORETURN;
+FOLLY_NORETURN void throwSystemError(Args&&... args);
 template <class... Args>
 void throwSystemError(Args&&... args) {
   throwSystemErrorExplicit(errno, std::forward<Args>(args)...);