Make more headers private (#554)

LLNL · Apr 9, 2024 · 8d143df · 8d143df
1 parent 7bb6338
commit 8d143df
Show file tree

Hide file tree

Showing 32 changed files with 42 additions and 44 deletions.
diff --git a/src/caliper/aggregate_over_mpi.cpp b/src/caliper/aggregate_over_mpi.cpp
@@ -6,10 +6,11 @@
 #include "caliper/reader/Aggregator.h"
 #include "caliper/reader/CaliperMetadataDB.h"
 
-#include "caliper/common/CompressedSnapshotRecord.h"
 #include "caliper/common/Node.h"
-#include "caliper/common/NodeBuffer.h"
-#include "caliper/common/SnapshotBuffer.h"
+
+#include "../common/CompressedSnapshotRecord.h"
+#include "../common/NodeBuffer.h"
+#include "../common/SnapshotBuffer.h"
 
 #include <set>
 

diff --git a/src/caliper/cali.cpp b/src/caliper/cali.cpp
@@ -10,7 +10,8 @@
 #include "caliper/Caliper.h"
 #include "caliper/SnapshotRecord.h"
 
-#include "caliper/common/CompressedSnapshotRecord.h"
+#include "../common/CompressedSnapshotRecord.h"
+
 #include "caliper/common/Log.h"
 #include "caliper/common/Node.h"
 #include "caliper/common/OutputStream.h"

diff --git a/src/caliper/test/test_c_snapshot.cpp b/src/caliper/test/test_c_snapshot.cpp
@@ -4,7 +4,8 @@
 #include "caliper/Caliper.h"
 #include "caliper/SnapshotRecord.h"
 
-#include "caliper/common/CompressedSnapshotRecord.h"
+#include "../../common/CompressedSnapshotRecord.h"
+
 #include "caliper/common/Node.h"
 
 #include <gtest/gtest.h>

diff --git a/src/common/CompressedSnapshotRecord.cpp b/src/common/CompressedSnapshotRecord.cpp
@@ -4,7 +4,7 @@
 /// \file CompressedSnapshotRecord.cc
 /// Caliper compressed snapshot record representation
 
-#include "caliper/common/CompressedSnapshotRecord.h"
+#include "CompressedSnapshotRecord.h"
 
 #include "util/vlenc.h"
 

diff --git a/...caliper/common/CompressedSnapshotRecord.h → src/common/CompressedSnapshotRecord.h b/...caliper/common/CompressedSnapshotRecord.h → src/common/CompressedSnapshotRecord.h
diff --git a/src/common/NodeBuffer.cpp b/src/common/NodeBuffer.cpp
@@ -4,7 +4,7 @@
 /// \brief NodeBuffer.cc
 /// NodeBuffer class definition
 
-#include "caliper/common/NodeBuffer.h"
+#include "NodeBuffer.h"
 
 #include "util/vlenc.h"
 

diff --git a/include/caliper/common/NodeBuffer.h → src/common/NodeBuffer.h b/include/caliper/common/NodeBuffer.h → src/common/NodeBuffer.h
diff --git a/src/common/OutputStream.cpp b/src/common/OutputStream.cpp
@@ -3,8 +3,9 @@
 
 #include "caliper/common/OutputStream.h"
 
+#include "SnapshotTextFormatter.h"
+
 #include "caliper/common/Log.h"
-#include "caliper/common/SnapshotTextFormatter.h"
 
 #include <cstring>
 #include <fstream>

diff --git a/src/common/SnapshotBuffer.cpp b/src/common/SnapshotBuffer.cpp
@@ -4,9 +4,9 @@
 /// \brief SnapshotBuffer.cc
 /// SnapshotBuffer class definition
 
-#include "caliper/common/SnapshotBuffer.h"
+#include "SnapshotBuffer.h"
 
-#include "caliper/common/CompressedSnapshotRecord.h"
+#include "CompressedSnapshotRecord.h"
 
 #include <cstring>
 

diff --git a/include/caliper/common/SnapshotBuffer.h → src/common/SnapshotBuffer.h b/include/caliper/common/SnapshotBuffer.h → src/common/SnapshotBuffer.h
diff --git a/src/common/SnapshotTextFormatter.cpp b/src/common/SnapshotTextFormatter.cpp
@@ -4,7 +4,7 @@
 /// \file  SnapshotTextFormatter.cpp
 /// \brief SnapshotTextFormatter implementation
 
-#include "caliper/common/SnapshotTextFormatter.h"
+#include "SnapshotTextFormatter.h"
 
 #include "caliper/common/CaliperMetadataAccessInterface.h"
 #include "caliper/common/Node.h"

diff --git a/...de/caliper/common/SnapshotTextFormatter.h → src/common/SnapshotTextFormatter.h b/...de/caliper/common/SnapshotTextFormatter.h → src/common/SnapshotTextFormatter.h
@@ -7,8 +7,6 @@
 #ifndef CALI_SNAPSHOT_TEXT_FORMATTER_H
 #define CALI_SNAPSHOT_TEXT_FORMATTER_H
 
-#include "Entry.h"
-
 #include <iostream>
 #include <memory>
 #include <string>
@@ -18,11 +16,11 @@ namespace cali
 {
 
 class CaliperMetadataAccessInterface;
+class Entry;
 
 class SnapshotTextFormatter
 {
     struct SnapshotTextFormatterImpl;
-
     std::unique_ptr<SnapshotTextFormatterImpl> mP;
 
 public:
@@ -31,10 +29,10 @@ class SnapshotTextFormatter
 
     ~SnapshotTextFormatter();
 
-    void 
+    void
     reset(const std::string& format_str);
 
-    std::ostream& 
+    std::ostream&
     print(std::ostream&, const CaliperMetadataAccessInterface&, const std::vector<Entry>&);
 };
 

diff --git a/src/common/test/test_compressedsnapshotrecord.cpp b/src/common/test/test_compressedsnapshotrecord.cpp
@@ -1,4 +1,4 @@
-#include "caliper/common/CompressedSnapshotRecord.h"
+#include "../CompressedSnapshotRecord.h"
 
 #include "MockupMetadataDB.h"
 

diff --git a/src/common/test/test_snapshotbuffer.cpp b/src/common/test/test_snapshotbuffer.cpp
@@ -1,6 +1,6 @@
-#include "caliper/common/SnapshotBuffer.h"
+#include "../SnapshotBuffer.h"
 
-#include "caliper/common/CompressedSnapshotRecord.h"
+#include "../CompressedSnapshotRecord.h"
 #include "caliper/common/Node.h"
 
 #include <gtest/gtest.h>

diff --git a/src/common/test/test_snapshottextformatter.cpp b/src/common/test/test_snapshottextformatter.cpp
@@ -1,4 +1,4 @@
-#include "caliper/common/SnapshotTextFormatter.h"
+#include "../SnapshotTextFormatter.h"
 
 #include "MockupMetadataDB.h"
 

diff --git a/src/reader/Expand.cpp b/src/reader/Expand.cpp
@@ -3,7 +3,7 @@
 
 // Print expanded records
 
-#include "caliper/reader/Expand.h"
+#include "Expand.h"
 
 #include "caliper/reader/QuerySpec.h"
 

diff --git a/include/caliper/reader/Expand.h → src/reader/Expand.h b/include/caliper/reader/Expand.h → src/reader/Expand.h
@@ -8,7 +8,6 @@
 #define CALI_EXPAND_H
 
 #include "Formatter.h"
-#include "RecordProcessor.h"
 
 #include <memory>
 

diff --git a/src/reader/FormatProcessor.cpp b/src/reader/FormatProcessor.cpp
@@ -3,13 +3,14 @@
 
 #include "caliper/reader/FormatProcessor.h"
 
+#include "Expand.h"
+#include "JsonFormatter.h"
+#include "JsonSplitFormatter.h"
+#include "TableFormatter.h"
+#include "TreeFormatter.h"
+#include "UserFormatter.h"
+
 #include "caliper/reader/CaliWriter.h"
-#include "caliper/reader/Expand.h"
-#include "caliper/reader/JsonFormatter.h"
-#include "caliper/reader/JsonSplitFormatter.h"
-#include "caliper/reader/TableFormatter.h"
-#include "caliper/reader/TreeFormatter.h"
-#include "caliper/reader/UserFormatter.h"
 
 #include "caliper/common/CaliperMetadataAccessInterface.h"
 #include "caliper/common/OutputStream.h"

diff --git a/include/caliper/reader/Formatter.h → src/reader/Formatter.h b/include/caliper/reader/Formatter.h → src/reader/Formatter.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "RecordProcessor.h"
+#include "caliper/reader/RecordProcessor.h"
 
 namespace cali
 {

diff --git a/src/reader/JsonFormatter.cpp b/src/reader/JsonFormatter.cpp
@@ -3,7 +3,7 @@
 
 // Print web-readable table in sparse format
 
-#include "caliper/reader/JsonFormatter.h"
+#include "JsonFormatter.h"
 
 #include "caliper/reader/QuerySpec.h"
 

diff --git a/include/caliper/reader/JsonFormatter.h → src/reader/JsonFormatter.h b/include/caliper/reader/JsonFormatter.h → src/reader/JsonFormatter.h
@@ -7,16 +7,15 @@
 #pragma once
 
 #include "Formatter.h"
-#include "RecordProcessor.h"
-
-#include "../common/OutputStream.h"
 
 #include <memory>
 
 namespace cali
 {
 
 class CaliperMetadataAccessInterface;
+class OutputStream;
+
 struct QuerySpec;
 
 /// \brief Prints snapshot records as sparse JSON

diff --git a/src/reader/JsonSplitFormatter.cpp b/src/reader/JsonSplitFormatter.cpp
@@ -3,7 +3,7 @@
 
 // Print web-readable table in sparse format
 
-#include "caliper/reader/JsonSplitFormatter.h"
+#include "JsonSplitFormatter.h"
 
 #include "caliper/reader/Aggregator.h"
 #include "caliper/reader/QuerySpec.h"

diff --git a/include/caliper/reader/JsonSplitFormatter.h → src/reader/JsonSplitFormatter.h b/include/caliper/reader/JsonSplitFormatter.h → src/reader/JsonSplitFormatter.h
@@ -7,7 +7,6 @@
 #pragma once
 
 #include "Formatter.h"
-#include "RecordProcessor.h"
 
 #include <memory>
 

diff --git a/src/reader/TableFormatter.cpp b/src/reader/TableFormatter.cpp
@@ -3,7 +3,7 @@
 
 // Print human-readable table
 
-#include "caliper/reader/TableFormatter.h"
+#include "TableFormatter.h"
 
 #include "caliper/reader/QuerySpec.h"
 

diff --git a/include/caliper/reader/TableFormatter.h → src/reader/TableFormatter.h b/include/caliper/reader/TableFormatter.h → src/reader/TableFormatter.h
@@ -8,7 +8,6 @@
 #define CALI_TABLE_H
 
 #include "Formatter.h"
-#include "RecordProcessor.h"
 
 #include <iostream>
 #include <memory>

diff --git a/src/reader/TreeFormatter.cpp b/src/reader/TreeFormatter.cpp
@@ -3,7 +3,7 @@
 
 // Pretty-print tree-organized snapshots
 
-#include "caliper/reader/TreeFormatter.h"
+#include "TreeFormatter.h"
 
 #include "SnapshotTableFormatter.h"
 #include "SnapshotTree.h"

diff --git a/include/caliper/reader/TreeFormatter.h → src/reader/TreeFormatter.h b/include/caliper/reader/TreeFormatter.h → src/reader/TreeFormatter.h
@@ -7,7 +7,6 @@
 #pragma once
 
 #include "Formatter.h"
-#include "RecordProcessor.h"
 
 #include <iostream>
 #include <memory>

diff --git a/src/reader/UserFormatter.cpp b/src/reader/UserFormatter.cpp
@@ -3,7 +3,7 @@
 
 // Print expanded records
 
-#include "caliper/reader/UserFormatter.h"
+#include "UserFormatter.h"
 
 #include "caliper/reader/QuerySpec.h"
 

diff --git a/include/caliper/reader/UserFormatter.h → src/reader/UserFormatter.h b/include/caliper/reader/UserFormatter.h → src/reader/UserFormatter.h
@@ -8,7 +8,6 @@
 #define CALI_FORMAT_H
 
 #include "Formatter.h"
-#include "RecordProcessor.h"
 
 #include <memory>
 

diff --git a/src/reader/test/test_nodebuffer.cpp b/src/reader/test/test_nodebuffer.cpp
@@ -1,4 +1,4 @@
-#include "caliper/common/NodeBuffer.h"
+#include "../../common/NodeBuffer.h"
 
 #include "caliper/reader/CaliperMetadataDB.h"
 

diff --git a/src/services/textlog/TextLog.cpp b/src/services/textlog/TextLog.cpp
@@ -14,7 +14,8 @@
 #include "caliper/common/Log.h"
 #include "caliper/common/OutputStream.h"
 #include "caliper/common/RuntimeConfig.h"
-#include "caliper/common/SnapshotTextFormatter.h"
+
+#include "../../common/SnapshotTextFormatter.h"
 
 #include <algorithm>
 #include <iostream>

diff --git a/src/services/validator/validator.cpp b/src/services/validator/validator.cpp
@@ -13,7 +13,7 @@
 #include "caliper/common/Node.h"
 #include "caliper/common/OutputStream.h"
 
-#include "caliper/reader/Expand.h"
+#include "../../reader/Expand.h"
 
 #include <atomic>
 #include <iostream>