Revert "[XRay][compiler-rt] FDRLogWriter Abstraction" and 1 more.

Revert the following 2 commits to fix standalone compiler-rt build:
* r342523 [XRay] Detect terminfo library
* r342518 [XRay][compiler-rt] FDRLogWriter Abstraction

llvm-svn: 342596

1 files changed, 4 insertions, 9 deletions

diff --git a/llvm/include/llvm/XRay/Trace.h b/llvm/include/llvm/XRay/Trace.h
index 924addd1560..262ff96bc23 100644
--- a/llvm/include/llvm/XRay/Trace.h
+++ b/llvm/include/llvm/XRay/Trace.h
@@ -46,25 +46,20 @@ namespace xray {
 ///
 class Trace {
   XRayFileHeader FileHeader;
-  using RecordVector = std::vector<XRayRecord>;
-  RecordVector Records;
+  std::vector<XRayRecord> Records;
 
   typedef std::vector<XRayRecord>::const_iterator citerator;
 
   friend Expected<Trace> loadTrace(const DataExtractor &, bool);
 
 public:
-  using size_type = RecordVector::size_type;
-  using value_type = RecordVector::value_type;
-  using const_iterator = RecordVector::const_iterator;
-
   /// Provides access to the loaded XRay trace file header.
   const XRayFileHeader &getFileHeader() const { return FileHeader; }
 
-  const_iterator begin() const { return Records.begin(); }
-  const_iterator end() const { return Records.end(); }
+  citerator begin() const { return Records.begin(); }
+  citerator end() const { return Records.end(); }
   bool empty() const { return Records.empty(); }
-  size_type size() const { return Records.size(); }
+  size_t size() const { return Records.size(); }
 };
 
 /// This function will attempt to load XRay trace records from the provided