projects
/
folly.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
EventCountTest cleanups
[folly.git]
/
folly
/
dynamic.h
diff --git
a/folly/dynamic.h
b/folly/dynamic.h
index 1494a557047feff2c25a36b8376c9dd781ef9b7a..0e03f8f4791b1b472a59d509b3de5dff8f87a037 100644
(file)
--- a/
folly/dynamic.h
+++ b/
folly/dynamic.h
@@
-63,19
+63,21
@@
#ifndef FOLLY_DYNAMIC_H_
#define FOLLY_DYNAMIC_H_
#ifndef FOLLY_DYNAMIC_H_
#define FOLLY_DYNAMIC_H_
-#include <unordered_map>
+#include <cstdint>
+#include <initializer_list>
#include <memory>
#include <memory>
-#include <string>
-#include <utility>
#include <ostream>
#include <ostream>
+#include <string>
#include <type_traits>
#include <type_traits>
-#include <initializer_list>
+#include <unordered_map>
+#include <utility>
#include <vector>
#include <vector>
-#include <cstdint>
+
#include <boost/operators.hpp>
#include <boost/operators.hpp>
-#include "folly/Traits.h"
-#include "folly/FBString.h"
+#include <folly/FBString.h>
+#include <folly/Range.h>
+#include <folly/Traits.h>
namespace folly {
namespace folly {
@@
-143,8
+145,11
@@
public:
/*
* String compatibility constructors.
*/
/*
* String compatibility constructors.
*/
+ /* implicit */ dynamic(StringPiece val);
/* implicit */ dynamic(char const* val);
/* implicit */ dynamic(std::string const& val);
/* implicit */ dynamic(char const* val);
/* implicit */ dynamic(std::string const& val);
+ /* implicit */ dynamic(fbstring const& val);
+ /* implicit */ dynamic(fbstring&& val);
/*
* This is part of the plumbing for object(), above. Used to create
/*
* This is part of the plumbing for object(), above. Used to create
@@
-326,7
+331,6
@@
public:
*/
const_item_iterator find(dynamic const&) const;
*/
const_item_iterator find(dynamic const&) const;
-
/*
* If this is an object, returns whether it contains a field with
* the given name. Otherwise throws TypeError.
/*
* If this is an object, returns whether it contains a field with
* the given name. Otherwise throws TypeError.
@@
-520,6
+524,6
@@
private:
}
}
-#include
"folly/dynamic-inl.h"
+#include
<folly/dynamic-inl.h>
#endif
#endif