| Index: sandbox/linux/seccomp-bpf/basicblock.h
|
| diff --git a/sandbox/linux/seccomp-bpf/basicblock.h b/sandbox/linux/seccomp-bpf/basicblock.h
|
| index 1782a8076bdc12d47827a86099c9c4e434f37679..a116f41b3ebdd0e18f9d916758b9379160bc0208 100644
|
| --- a/sandbox/linux/seccomp-bpf/basicblock.h
|
| +++ b/sandbox/linux/seccomp-bpf/basicblock.h
|
| @@ -9,7 +9,6 @@
|
|
|
| #include "sandbox/linux/seccomp-bpf/instruction.h"
|
|
|
| -
|
| namespace playground2 {
|
|
|
| struct BasicBlock {
|
| @@ -20,25 +19,24 @@ struct BasicBlock {
|
| // identify common sequences of basic blocks. This would normally be
|
| // really easy to do, but STL requires us to wrap the comparator into
|
| // a class. We begrudgingly add some code here that provides this wrapping.
|
| - template<class T> class Less {
|
| + template <class T>
|
| + class Less {
|
| public:
|
| - Less(const T& data, int (*cmp)(const BasicBlock *, const BasicBlock *,
|
| - const T& data))
|
| - : data_(data),
|
| - cmp_(cmp) {
|
| - }
|
| + Less(const T& data,
|
| + int (*cmp)(const BasicBlock*, const BasicBlock*, const T& data))
|
| + : data_(data), cmp_(cmp) {}
|
|
|
| - bool operator() (const BasicBlock *a, const BasicBlock *b) const {
|
| + bool operator()(const BasicBlock* a, const BasicBlock* b) const {
|
| return cmp_(a, b, data_) < 0;
|
| }
|
|
|
| private:
|
| const T& data_;
|
| - int (*cmp_)(const BasicBlock *, const BasicBlock *, const T&);
|
| + int (*cmp_)(const BasicBlock*, const BasicBlock*, const T&);
|
| };
|
|
|
| // Basic blocks are essentially nothing more than a set of instructions.
|
| - std::vector<Instruction *> instructions;
|
| + std::vector<Instruction*> instructions;
|
|
|
| // In order to compute relative branch offsets we need to keep track of
|
| // how far our block is away from the very last basic block. The "offset_"
|
|
|