Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove deprecated .h headers #994

Merged
merged 1 commit into from
Aug 7, 2024
Merged

Remove deprecated .h headers #994

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions applications/resdata/convert.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@
#include <stdbool.h>
#include <string.h>

#include <ert/util/util.h>
#include <ert/util/util.hpp>

#include <resdata/rd_kw.h>
#include <resdata/rd_kw.hpp>
#include <resdata/fortio.h>
#include <resdata/rd_util.h>
#include <resdata/rd_endian_flip.h>
#include <resdata/rd_util.hpp>
#include <resdata/rd_endian_flip.hpp>

void file_convert(const char *src_file, const char *target_file,
rd_file_enum file_type, bool fmt_src) {
Expand Down
8 changes: 4 additions & 4 deletions applications/resdata/grdecl_grid.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@
#include <stdlib.h>
#include <stdio.h>

#include <ert/util/util.h>
#include <ert/util/util.hpp>

#include <resdata/rd_kw.h>
#include <resdata/rd_grid.h>
#include <resdata/rd_kw_magic.h>
#include <resdata/rd_kw.hpp>
#include <resdata/rd_grid.hpp>
#include <resdata/rd_kw_magic.hpp>

int main(int argc, char **argv) {
FILE *stream = util_fopen(argv[1], "r");
Expand Down
4 changes: 2 additions & 2 deletions applications/resdata/grdecl_test.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
#include <stdlib.h>
#include <stdio.h>

#include <ert/util/util.h>
#include <resdata/rd_kw.h>
#include <ert/util/util.hpp>
#include <resdata/rd_kw.hpp>

int main(int argc, char **argv) {
FILE *stream = util_fopen(argv[1], "r");
Expand Down
4 changes: 2 additions & 2 deletions applications/resdata/grid_dump.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
#include <stdlib.h>
#include <stdio.h>

#include <ert/util/util.h>
#include <ert/util/util.hpp>

#include <resdata/rd_grid.h>
#include <resdata/rd_grid.hpp>

int main(int argc, char **argv) {
if (argc < 2) {
Expand Down
4 changes: 2 additions & 2 deletions applications/resdata/grid_dump_ascii.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
#include <stdlib.h>
#include <stdio.h>

#include <ert/util/util.h>
#include <ert/util/util.hpp>

#include <resdata/rd_grid.h>
#include <resdata/rd_grid.hpp>

int main(int argc, char **argv) {
if (argc < 2) {
Expand Down
4 changes: 2 additions & 2 deletions applications/resdata/grid_info.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
#include <stdlib.h>
#include <stdio.h>

#include <ert/util/util.h>
#include <ert/util/util.hpp>

#include <resdata/rd_grid.h>
#include <resdata/rd_grid.hpp>

int main(int argc, char **argv) {
if (argc < 2) {
Expand Down
16 changes: 8 additions & 8 deletions applications/resdata/kw_extract.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@
#include <stdbool.h>
#include <string.h>

#include <ert/util/util.h>
#include <ert/util/hash.h>
#include <ert/util/stringlist.h>
#include <ert/util/util.hpp>
#include <ert/util/hash.hpp>
#include <ert/util/stringlist.hpp>

#include <resdata/rd_kw.h>
#include <resdata/rd_kw.hpp>
#include <resdata/fortio.h>
#include <resdata/rd_util.h>
#include <resdata/rd_sum.h>
#include <resdata/rd_grid.h>
#include <resdata/rd_endian_flip.h>
#include <resdata/rd_util.hpp>
#include <resdata/rd_sum.hpp>
#include <resdata/rd_grid.hpp>
#include <resdata/rd_endian_flip.hpp>

/**
This file will extract all occurences of kw1,kw2,...,kwn from the
Expand Down
6 changes: 3 additions & 3 deletions applications/resdata/kw_list.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@
#include <stdbool.h>
#include <string.h>

#include <resdata/rd_kw.h>
#include <resdata/rd_kw.hpp>
#include <resdata/fortio.h>
#include <resdata/rd_util.h>
#include <resdata/rd_endian_flip.h>
#include <resdata/rd_util.hpp>
#include <resdata/rd_endian_flip.hpp>

void kw_list(const char *filename) {
fortio_type *fortio;
Expand Down
4 changes: 2 additions & 2 deletions applications/resdata/load_test.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
#include <stdio.h>
#include <stdbool.h>

#include <resdata/rd_grid.h>
#include <resdata/rd_file.h>
#include <resdata/rd_grid.hpp>
#include <resdata/rd_file.hpp>

void test_case(const char *base, bool load_all) {
char *grid_file = rd_alloc_filename(NULL, base, RD_EGRID_FILE, false, 0);
Expand Down
4 changes: 2 additions & 2 deletions applications/resdata/make_grid.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
#include <stdlib.h>
#include <stdio.h>

#include <ert/util/util.h>
#include <ert/util/util.hpp>

#include <resdata/rd_grid.h>
#include <resdata/rd_grid.hpp>

int main(int argc, char **argv) {
if (argc != 5) {
Expand Down
12 changes: 6 additions & 6 deletions applications/resdata/rd_pack.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@

#include <stdlib.h>

#include <ert/util/util.h>
#include <ert/util/stringlist.h>
#include <ert/util/util.hpp>
#include <ert/util/stringlist.hpp>

#include <resdata/rd_file.h>
#include <resdata/rd_util.h>
#include <resdata/rd_endian_flip.h>
#include <resdata/rd_type.h>
#include <resdata/rd_file.hpp>
#include <resdata/rd_util.hpp>
#include <resdata/rd_endian_flip.hpp>
#include <resdata/rd_type.hpp>

int main(int argc, char **argv) {
int num_files = argc - 1;
Expand Down
12 changes: 6 additions & 6 deletions applications/resdata/rd_unpack.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@

#include <stdbool.h>

#include <ert/util/util.h>
#include <ert/util/util.hpp>

#include <resdata/rd_file.h>
#include <resdata/rd_util.h>
#include <resdata/rd_kw.h>
#include <resdata/rd_endian_flip.h>
#include <resdata/rd_kw_magic.h>
#include <resdata/rd_file.hpp>
#include <resdata/rd_util.hpp>
#include <resdata/rd_kw.hpp>
#include <resdata/rd_endian_flip.hpp>
#include <resdata/rd_kw_magic.hpp>

void unpack_file(const char *filename) {
rd_file_enum target_type = RD_OTHER_FILE;
Expand Down
6 changes: 3 additions & 3 deletions applications/resdata/select_test.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
#include <stdlib.h>
#include <stdio.h>

#include <ert/util/util.h>
#include <ert/util/stringlist.h>
#include <ert/util/util.hpp>
#include <ert/util/stringlist.hpp>

#include <resdata/rd_kw.h>
#include <resdata/rd_kw.hpp>

int main(int argc, char **argv) {
const char *path = argv[1];
Expand Down
10 changes: 5 additions & 5 deletions applications/resdata/sum_write.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
#include <stdlib.h>
#include <string.h>

#include <ert/util/util.h>
#include <ert/util/vector.h>
#include <ert/util/util.hpp>
#include <ert/util/vector.hpp>

#include <resdata/rd_kw.h>
#include <resdata/rd_sum.h>
#include <resdata/smspec_node.h>
#include <resdata/rd_kw.hpp>
#include <resdata/rd_sum.hpp>
#include <resdata/smspec_node.hpp>

/*
The summary data is stored in two different files:
Expand Down
4 changes: 2 additions & 2 deletions applications/resdata/view_summary.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
#include <string.h>
#include <signal.h>

#include <ert/util/ert_api_config.h>
#include <ert/util/ert_api_config.hpp>

#ifdef ERT_HAVE_GETOPT
#include <getopt.h>
#endif

#include <ert/util/util.h>
#include <ert/util/util.hpp>
#include <ert/util/stringlist.hpp>

#include <resdata/rd_kw.hpp>
Expand Down
6 changes: 3 additions & 3 deletions applications/well/ri_well_test.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
for more details.
*/

#include <resdata/rd_grid.h>
#include <resdata/well/well_state.h>
#include <resdata/well/well_info.h>
#include <resdata/rd_grid.hpp>
#include <resdata/well/well_state.hpp>
#include <resdata/well/well_info.hpp>

/*
This is a small test program which will load the well information in
Expand Down
26 changes: 13 additions & 13 deletions applications/well/segment_info.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,19 @@
#include <stdbool.h>
#include <math.h>

#include <ert/util/stringlist.h>
#include <ert/util/test_util.h>

#include <resdata/rd_util.h>
#include <resdata/rd_file.h>
#include <resdata/rd_rsthead.h>
#include <resdata/rd_kw_magic.h>
#include <resdata/rd_grid.h>

#include <resdata/well/well_conn_collection.h>
#include <resdata/well/well_segment.h>
#include <resdata/well/well_const.h>
#include <resdata/well/well_segment_collection.h>
#include <ert/util/stringlist.hpp>
#include <ert/util/test_util.hpp>

#include <resdata/rd_util.hpp>
#include <resdata/rd_file.hpp>
#include <resdata/rd_rsthead.hpp>
#include <resdata/rd_kw_magic.hpp>
#include <resdata/rd_grid.hpp>

#include <resdata/well/well_conn_collection.hpp>
#include <resdata/well/well_segment.hpp>
#include <resdata/well/well_const.hpp>
#include <resdata/well/well_segment_collection.hpp>

int main(int argc, char **argv) {
const char *Xfile = argv[1];
Expand Down
6 changes: 3 additions & 3 deletions applications/well/well_CF_dump.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
for more details.
*/

#include <resdata/rd_grid.h>
#include <resdata/well/well_state.h>
#include <resdata/well/well_info.h>
#include <resdata/rd_grid.hpp>
#include <resdata/well/well_state.hpp>
#include <resdata/well/well_info.hpp>

int main(int argc, char **argv) {
char *grid_file = argv[1];
Expand Down
4 changes: 0 additions & 4 deletions lib/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ endif()
foreach(type int double long time_t float)
set(TYPE ${type})
set(SIGNED_TYPE true)
configure_file(vector_template.h.in include/ert/util/${type}_vector.h)
configure_file(vector_template.hpp.in include/ert/util/${type}_vector.hpp)
configure_file(util/vector_template.cpp.in ${type}_vector.cpp)
list(APPEND opt_srcs ${CMAKE_CURRENT_BINARY_DIR}/${type}_vector.cpp)
Expand All @@ -34,7 +33,6 @@ endforeach()
foreach(type bool size_t)
set(TYPE ${type})
set(SIGNED_TYPE false)
configure_file(vector_template.h.in include/ert/util/${type}_vector.h)
configure_file(vector_template.hpp.in include/ert/util/${type}_vector.hpp)
configure_file(util/vector_template.cpp.in ${type}_vector.cpp)
list(APPEND opt_srcs ${CMAKE_CURRENT_BINARY_DIR}/${type}_vector.cpp)
Expand All @@ -44,8 +42,6 @@ if(ZLIB_FOUND)
list(APPEND opt_srcs util/util_zlib.cpp)
endif()

configure_file(build_config.h.in include/ert/util/build_config.h)
configure_file(ert_api_config.h.in include/ert/util/ert_api_config.h)
configure_file(build_config.hpp.in include/ert/util/build_config.hpp)
configure_file(ert_api_config.hpp.in include/ert/util/ert_api_config.hpp)

Expand Down
50 changes: 0 additions & 50 deletions lib/build_config.h.in
View file
Open in desktop

This file was deleted.

Loading