[rtems-tools commit] tester/covoar: Fix clang compile errors, revert uneeded changes

Chris Johns chrisj at rtems.org
Fri Sep 3 04:46:35 UTC 2021


Module:    rtems-tools
Branch:    master
Commit:    b4245dd209c6ba4b10392c857f97e7edb4c975ec
Changeset: http://git.rtems.org/rtems-tools/commit/?id=b4245dd209c6ba4b10392c857f97e7edb4c975ec

Author:    Chris Johns <chrisj at rtems.org>
Date:      Fri Sep  3 14:43:47 2021 +1000

tester/covoar: Fix clang compile errors, revert uneeded changes

---

 rtemstoolkit/rld-dwarf.cpp |  3 ---
 tester/covoar/GcovData.cc  | 28 ++++++++++++++--------------
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/rtemstoolkit/rld-dwarf.cpp b/rtemstoolkit/rld-dwarf.cpp
index 2d6f306..e41be8c 100644
--- a/rtemstoolkit/rld-dwarf.cpp
+++ b/rtemstoolkit/rld-dwarf.cpp
@@ -686,11 +686,8 @@ namespace rld
         pc_low_ (0),
         pc_high_ (0),
         ranges_ (debug),
-        name_ (),
         linkage_name_ (),
-        decl_file_ (),
         decl_line_ (0),
-        call_file_ (),
         call_line_ (0)
     {
       dwarf_bool db;
diff --git a/tester/covoar/GcovData.cc b/tester/covoar/GcovData.cc
index d360a77..397c20d 100644
--- a/tester/covoar/GcovData.cc
+++ b/tester/covoar/GcovData.cc
@@ -95,20 +95,20 @@ namespace Gcov {
 
   bool GcovData::writeGcdaFile()
   {
-    gcov_preamble         preamble;
-    gcov_frame_header     header;
-    std::ofstream         gcdaFile;
-    functions_iterator_t  currentFunction;
-    arcs_iterator_t       currentArc;
-    uint32_t              buffer;
-    uint32_t              countersFound;
-    uint32_t              countersFoundSum;
-    uint64_t              countersSum;
-    uint64_t              countersMax;
-    uint64_t              llBuffer[4096];    // TODO: Use common buffer
-    gcov_statistics       objectStats;
-    gcov_statistics       programStats;
-    long int              bytes_before;
+    gcov_preamble           preamble;
+    gcov_frame_header       header;
+    std::ofstream           gcdaFile;
+    functions_iterator_t    currentFunction;
+    arcs_iterator_t         currentArc;
+    uint32_t                buffer;
+    uint32_t                countersFound;
+    uint32_t                countersFoundSum;
+    uint64_t                countersSum;
+    uint64_t                countersMax;
+    uint64_t                llBuffer[4096];    // TODO: Use common buffer
+    gcov_statistics         objectStats;
+    gcov_statistics         programStats;
+    std::ofstream::pos_type bytes_before;
 
     // Debug message
     //std::cerr << "Writing file: " <<  gcdaFileName << std::endl;



More information about the vc mailing list