make Range::size() constexpr

[folly.git] / folly / DiscriminatedPtr.h

diff --git a/folly/DiscriminatedPtr.h b/folly/DiscriminatedPtr.h
index 1332701d3560e53fca8b5fc4b3285f3441196c21..24494eff0124553f92ff414ec50167ae3e72bd21 100644 (file)
--- a/folly/DiscriminatedPtr.h
+++ b/folly/DiscriminatedPtr.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 Facebook, Inc.
+ * Copyright 2016 Facebook, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,17 +24,17 @@
  * @author Tudor Bosman (tudorb@fb.com)
  */
 
-#ifndef FOLLY_DISCRIMINATEDPTR_H_
-#define FOLLY_DISCRIMINATEDPTR_H_
+#pragma once
 
 #include <limits>
 #include <stdexcept>
 #include <glog/logging.h>
-#include "folly/Likely.h"
-#include "folly/detail/DiscriminatedPtrDetail.h"
+#include <folly/Likely.h>
+#include <folly/Portability.h>
+#include <folly/detail/DiscriminatedPtrDetail.h>
 
-#ifndef __x86_64__
-# error "DiscriminatedPtr is x64-specific code."
+#if !FOLLY_X64 && !FOLLY_PPC64
+# error "DiscriminatedPtr is x64 and ppc64 specific code."
 #endif
 
 namespace folly {
@@ -216,6 +216,3 @@ class DiscriminatedPtr {
 };
 
 }  // namespace folly
-
-#endif /* FOLLY_DISCRIMINATEDPTR_H_ */
-