projects
/
folly.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove duplicates during bulk insertion.
[folly.git]
/
folly
/
test
/
FileTestLockHelper.cpp
diff --git
a/folly/test/FileTestLockHelper.cpp
b/folly/test/FileTestLockHelper.cpp
index 27dcb88f372f68637294a675226b4b1c791f52e6..baa7477e2c2f41adc490cae2671de228b45803a2 100644
(file)
--- a/
folly/test/FileTestLockHelper.cpp
+++ b/
folly/test/FileTestLockHelper.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright 201
4
Facebook, Inc.
+ * Copyright 201
7
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,16
+14,16
@@
* limitations under the License.
*/
* limitations under the License.
*/
-#include <gflags/gflags.h>
#include <glog/logging.h>
#include <glog/logging.h>
-#include "folly/File.h"
+#include <folly/File.h>
+#include <folly/portability/GFlags.h>
DEFINE_bool(s, false, "get shared lock");
DEFINE_bool(x, false, "get exclusive lock");
int main(int argc, char *argv[]) {
DEFINE_bool(s, false, "get shared lock");
DEFINE_bool(x, false, "get exclusive lock");
int main(int argc, char *argv[]) {
- g
oogle
::ParseCommandLineFlags(&argc, &argv, true);
+ g
flags
::ParseCommandLineFlags(&argc, &argv, true);
google::InitGoogleLogging(argv[0]);
CHECK_EQ(FLAGS_s + FLAGS_x, 1)
<< "exactly one of -s and -x must be specified";
google::InitGoogleLogging(argv[0]);
CHECK_EQ(FLAGS_s + FLAGS_x, 1)
<< "exactly one of -s and -x must be specified";