projects
/
folly.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix multi-line comment warnings
[folly.git]
/
folly
/
test
/
PortabilityTest.cpp
diff --git
a/folly/test/PortabilityTest.cpp
b/folly/test/PortabilityTest.cpp
index a6717dd54967d5a14a525434904e1b4274655c56..923c2391cbdcc46590fbbfce8e9f4113c5dd5a36 100644
(file)
--- a/
folly/test/PortabilityTest.cpp
+++ b/
folly/test/PortabilityTest.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright 201
2
Facebook, Inc.
+ * Copyright 201
5
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,7
+14,7
@@
* limitations under the License.
*/
* limitations under the License.
*/
-#include
"folly/Portability.h"
+#include
<folly/Portability.h>
#include <memory>
#include <memory>
@@
-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()));
}
-