Revert "Fix Clang-tidy modernize-deprecated-headers warnings in remaining files; other minor fixes."

This reverts commit r265454 since it broke the build.  E.g.:

  http://lab.llvm.org:8080/green/job/clang-stage1-cmake-RA-incremental_build/22413/

llvm-svn: 265459

1 files changed, 4 insertions, 9 deletions

diff --git a/llvm/unittests/ADT/SCCIteratorTest.cpp b/llvm/unittests/ADT/SCCIteratorTest.cpp
index 95639940160..da8c04483f9 100644
--- a/llvm/unittests/ADT/SCCIteratorTest.cpp
+++ b/llvm/unittests/ADT/SCCIteratorTest.cpp
@@ -10,10 +10,7 @@
 #include "llvm/ADT/SCCIterator.h"
 #include "llvm/ADT/GraphTraits.h"
 #include "gtest/gtest.h"
-#include <cassert>
-#include <climits>
-#include <utility>
-#include <vector>
+#include <limits.h>
 
 using namespace llvm;
 
@@ -30,14 +27,13 @@ private:
   static void ValidateIndex(unsigned Idx) {
     assert(Idx < N && "Invalid node index!");
   }
-
 public:
+
   /// NodeSubset - A subset of the graph's nodes.
   class NodeSubset {
     typedef unsigned char BitVector; // Where the limitation N <= 8 comes from.
     BitVector Elements;
     NodeSubset(BitVector e) : Elements(e) {}
-
   public:
     /// NodeSubset - Default constructor, creates an empty subset.
     NodeSubset() : Elements(0) {
@@ -102,8 +98,8 @@ public:
 private:
   /// Nodes - The list of nodes for this graph.
   NodeType Nodes[N];
-
 public:
+
   /// Graph - Default constructor.  Creates an empty graph.
   Graph() {
     // Let each node know which node it is.  This allows us to find the start of
@@ -170,7 +166,6 @@ public:
     NodeSubset Children;
 
     ChildIterator(); // Disable default constructor.
-
   protected:
     ChildIterator(NodeType *F, NodeSubset C) : FirstNode(F), Children(C) {}
 
@@ -346,4 +341,4 @@ TEST(SCCIteratorTest, AllSmallGraphs) {
   }
 }
 
-} // end namespace llvm
+}