Skip to content

Commit ad3430f

Browse files
authored
refactor: remove -isystem on local include header files (#211)
1 parent f9dfc97 commit ad3430f

File tree

3 files changed

+11
-12
lines changed

3 files changed

+11
-12
lines changed

cmake_modules/IcebergBuildUtils.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ function(add_iceberg_lib LIB_NAME)
131131
endif()
132132

133133
if(LIB_INCLUDES)
134-
target_include_directories(${LIB_NAME}_shared SYSTEM PUBLIC ${ARG_EXTRA_INCLUDES})
134+
target_include_directories(${LIB_NAME}_shared PUBLIC ${ARG_EXTRA_INCLUDES})
135135
endif()
136136

137137
if(ARG_PRIVATE_INCLUDES)
@@ -179,7 +179,7 @@ function(add_iceberg_lib LIB_NAME)
179179
endif()
180180

181181
if(LIB_INCLUDES)
182-
target_include_directories(${LIB_NAME}_static SYSTEM PUBLIC ${ARG_EXTRA_INCLUDES})
182+
target_include_directories(${LIB_NAME}_static PUBLIC ${ARG_EXTRA_INCLUDES})
183183
endif()
184184

185185
if(ARG_PRIVATE_INCLUDES)

src/iceberg/table_metadata.h

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -87,11 +87,11 @@ struct ICEBERG_EXPORT TableMetadata {
8787
/// The highest assigned column ID for the table
8888
int32_t last_column_id;
8989
/// A list of schemas
90-
std::vector<std::shared_ptr<Schema>> schemas;
90+
std::vector<std::shared_ptr<iceberg::Schema>> schemas;
9191
/// ID of the table's current schema
9292
std::optional<int32_t> current_schema_id;
9393
/// A list of partition specs
94-
std::vector<std::shared_ptr<PartitionSpec>> partition_specs;
94+
std::vector<std::shared_ptr<iceberg::PartitionSpec>> partition_specs;
9595
/// ID of the current partition spec that writers should use by default
9696
int32_t default_spec_id;
9797
/// The highest assigned partition field ID across all partition specs for the table
@@ -101,15 +101,15 @@ struct ICEBERG_EXPORT TableMetadata {
101101
/// ID of the current table snapshot
102102
int64_t current_snapshot_id;
103103
/// A list of valid snapshots
104-
std::vector<std::shared_ptr<Snapshot>> snapshots;
104+
std::vector<std::shared_ptr<iceberg::Snapshot>> snapshots;
105105
/// A list of timestamp and snapshot ID pairs that encodes changes to the current
106106
/// snapshot for the table
107107
std::vector<SnapshotLogEntry> snapshot_log;
108108
/// A list of timestamp and metadata file location pairs that encodes changes to the
109109
/// previous metadata files for the table
110110
std::vector<MetadataLogEntry> metadata_log;
111111
/// A list of sort orders
112-
std::vector<std::shared_ptr<SortOrder>> sort_orders;
112+
std::vector<std::shared_ptr<iceberg::SortOrder>> sort_orders;
113113
/// Default sort order id of the table
114114
int32_t default_sort_order_id;
115115
/// A map of snapshot references
@@ -122,16 +122,16 @@ struct ICEBERG_EXPORT TableMetadata {
122122
int64_t next_row_id;
123123

124124
/// \brief Get the current schema, return NotFoundError if not found
125-
Result<std::shared_ptr<Schema>> Schema() const;
125+
Result<std::shared_ptr<iceberg::Schema>> Schema() const;
126126
/// \brief Get the current schema by ID, return NotFoundError if not found
127127
Result<std::shared_ptr<iceberg::Schema>> SchemaById(
128128
const std::optional<int32_t>& schema_id) const;
129129
/// \brief Get the current partition spec, return NotFoundError if not found
130-
Result<std::shared_ptr<PartitionSpec>> PartitionSpec() const;
130+
Result<std::shared_ptr<iceberg::PartitionSpec>> PartitionSpec() const;
131131
/// \brief Get the current sort order, return NotFoundError if not found
132-
Result<std::shared_ptr<SortOrder>> SortOrder() const;
132+
Result<std::shared_ptr<iceberg::SortOrder>> SortOrder() const;
133133
/// \brief Get the current snapshot, return NotFoundError if not found
134-
Result<std::shared_ptr<Snapshot>> Snapshot() const;
134+
Result<std::shared_ptr<iceberg::Snapshot>> Snapshot() const;
135135
/// \brief Get the snapshot of this table with the given id
136136
Result<std::shared_ptr<iceberg::Snapshot>> SnapshotById(int64_t snapshot_id) const;
137137

@@ -145,7 +145,7 @@ ICEBERG_EXPORT std::string ToString(const SnapshotLogEntry& entry);
145145
ICEBERG_EXPORT std::string ToString(const MetadataLogEntry& entry);
146146

147147
/// \brief The codec type of the table metadata file.
148-
ICEBERG_EXPORT enum class MetadataFileCodecType {
148+
enum class ICEBERG_EXPORT MetadataFileCodecType {
149149
kNone,
150150
kGzip,
151151
};

src/iceberg/transform.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121

2222
#include <format>
2323
#include <regex>
24-
#include <utility>
2524

2625
#include "iceberg/transform_function.h"
2726
#include "iceberg/type.h"

0 commit comments

Comments
 (0)