projects
/
folly.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
folly/test/ExceptionWrapperTest.cpp: avoid shadowing warnings
[folly.git]
/
folly
/
test
/
PortabilityTest.cpp
diff --git
a/folly/test/PortabilityTest.cpp
b/folly/test/PortabilityTest.cpp
index ae871dc38442acab644bc01c89d5c2531ae960b1..58d104d940c7eeeb150cf2e9c66831fad79e9d61 100644
(file)
--- a/
folly/test/PortabilityTest.cpp
+++ b/
folly/test/PortabilityTest.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright 201
4
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.
@@
-14,11
+14,11
@@
* limitations under the License.
*/
* limitations under the License.
*/
-#include
"folly/Portability.h"
+#include
<folly/Portability.h>
#include <memory>
#include <memory>
-#include <
gtest/gt
est.h>
+#include <
folly/portability/GT
est.h>
class Base {
public:
class Base {
public:
@@
-28,7
+28,7
@@
class Base {
class Derived : public Base {
public:
class Derived : public Base {
public:
-
virtual int foo() const FOLLY_FINAL
{ return 2; }
+
int foo() const final
{ return 2; }
};
// A compiler that supports final will likely inline the call to p->foo()
};
// A compiler that supports final will likely inline the call to p->foo()
@@
-42,4
+42,3
@@
TEST(Portability, Final) {
EXPECT_EQ(3, fooBase(p.get()));
EXPECT_EQ(3, fooDerived(p.get()));
}
EXPECT_EQ(3, fooBase(p.get()));
EXPECT_EQ(3, fooDerived(p.get()));
}
-