projects
/
folly.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Construct TestObject in AtomicLinkedListTest via a const reference
[folly.git]
/
folly
/
DiscriminatedPtr.h
diff --git
a/folly/DiscriminatedPtr.h
b/folly/DiscriminatedPtr.h
index 74f4150e84a7ca7ef3e8deacee574049de7586f6..43eb81e50a8ae4097d47b116083d52f10b40b28a 100644
(file)
--- a/
folly/DiscriminatedPtr.h
+++ b/
folly/DiscriminatedPtr.h
@@
-1,5
+1,5
@@
/*
/*
- * Copyright 201
3
Facebook, Inc.
+ * Copyright 201
6
Facebook, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* 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)
*/
* @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 <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>
-#if
ndef __x86_64__
-# error "DiscriminatedPtr is x64
-
specific code."
+#if
!FOLLY_X64 && !FOLLY_A64 && !FOLLY_PPC64
+# error "DiscriminatedPtr is x64
, arm64 and ppc64
specific code."
#endif
namespace folly {
#endif
namespace folly {
@@
-216,6
+216,3
@@
class DiscriminatedPtr {
};
} // namespace folly
};
} // namespace folly
-
-#endif /* FOLLY_DISCRIMINATEDPTR_H_ */
-