Skip to content

Commit

Permalink
Merge branch 'cran-check-warnings' of https://github.com/davidchall/i…
Browse files Browse the repository at this point in the history
…paddress into cran-check-warnings
  • Loading branch information
davidchall committed Nov 30, 2023
2 parents 6f8ab00 + 3cb8763 commit 7c7f6f4
Show file tree
Hide file tree
Showing 8 changed files with 16 additions and 2 deletions.
3 changes: 1 addition & 2 deletions src/Makevars
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
PKG_CPPFLAGS = -I../inst/include/
PKG_CXXFLAGS = -DASIO_STANDALONE -DASIO_NO_DEPRECATED -D_LIBCPP_DISABLE_DEPRECATION_WARNINGS
PKG_CPPFLAGS = -I../inst/include/ -DASIO_STANDALONE -DASIO_NO_DEPRECATED
9 changes: 9 additions & 0 deletions src/asio_config.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#ifndef __IPADDRESS_ASIO_CONFIG__
#define __IPADDRESS_ASIO_CONFIG__

// libc++ throws bogus warning about allocator<void> -- https://llvm.org/PR50299
#if defined(_LIBCPP_VERSION) && (_LIBCPP_VERSION < 13000) && defined(_LIBCPP_STD_VER) && (_LIBCPP_STD_VER == 17)
#define _LIBCPP_DISABLE_DEPRECATION_WARNINGS
#endif

#endif
1 change: 1 addition & 0 deletions src/ip_address.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#include <Rcpp.h>
#include "asio_config.h"
#include <asio/ip/address_v4.hpp>
#include <asio/ip/address_v6.hpp>
#include <ipaddress.h>
Expand Down
1 change: 1 addition & 0 deletions src/ip_network.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#include <Rcpp.h>
#include "asio_config.h"
#include <asio/ip/network_v4.hpp>
#include <asio/ip/network_v6.hpp>
#include <ipaddress.h>
Expand Down
1 change: 1 addition & 0 deletions src/ip_to_hostname.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#include <Rcpp.h>
#include "asio_config.h"
#include <asio/ip/tcp.hpp>
#include <ipaddress.h>
#include "warn.h"
Expand Down
1 change: 1 addition & 0 deletions src/masking.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#include <Rcpp.h>
#include "asio_config.h"
#include <ipaddress.h>
#include <ipaddress/to_string.h>
#include "warn.h"
Expand Down
1 change: 1 addition & 0 deletions src/operators.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#include <Rcpp.h>
#include "asio_config.h"
#include <ipaddress.h>
#include <ipaddress/to_string.h>
#include "warn.h"
Expand Down
1 change: 1 addition & 0 deletions src/reserved.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#include <Rcpp.h>
#include "asio_config.h"
#include <asio/ip/address_v4.hpp>
#include <asio/ip/address_v6.hpp>
#include <ipaddress.h>
Expand Down

0 comments on commit 7c7f6f4

Please sign in to comment.