Skip to content

Replace deprecated BOOST_OS_ANDROID with BOOST_PLAT_ANDROID #116

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

Open
apolukhin wants to merge 1 commit into
base: develop
Choose a base branch
from
+6 −6
Open

Replace deprecated BOOST_OS_ANDROID with BOOST_PLAT_ANDROID #116

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
4 changes: 2 additions & 2 deletions include/boost/dll/alias.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ namespace boost { namespace dll {
#else // #if BOOST_COMP_MSVC


#if BOOST_OS_WINDOWS || BOOST_OS_ANDROID || BOOST_COMP_IBM
#if BOOST_OS_WINDOWS || BOOST_PLAT_ANDROID || BOOST_COMP_IBM
// There are some problems with mixing `__dllexport__` and `weak` using MinGW
// See https://sourceware.org/bugzilla/show_bug.cgi?id=17480
//
Expand Down Expand Up @@ -177,7 +177,7 @@ namespace boost { namespace dll {
/**/


#if ((BOOST_COMP_GNUC && BOOST_OS_WINDOWS) || BOOST_OS_ANDROID || BOOST_COMP_IBM || defined(BOOST_DLL_FORCE_NO_WEAK_EXPORTS)) \
#if ((BOOST_COMP_GNUC && BOOST_OS_WINDOWS) || BOOST_PLAT_ANDROID || BOOST_COMP_IBM || defined(BOOST_DLL_FORCE_NO_WEAK_EXPORTS)) \
&& !defined(BOOST_DLL_FORCE_ALIAS_INSTANTIATION) && !defined(BOOST_DLL_DOXYGEN)

#define BOOST_DLL_ALIAS_SECTIONED(FunctionOrVar, AliasName, SectionName) \
Expand Down
4 changes: 2 additions & 2 deletions include/boost/dll/detail/posix/path_from_handle.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ namespace boost { namespace dll { namespace detail {

}}} // namespace boost::dll::detail

#elif BOOST_OS_ANDROID
#elif BOOST_PLAT_ANDROID

#if !defined(BOOST_DLL_INTERFACE_UNIT)
#include <boost/dll/runtime_symbol_info.hpp>
Expand Down Expand Up @@ -106,7 +106,7 @@ namespace boost { namespace dll { namespace detail {

}}} // namespace boost::dll::detail

#else // #if BOOST_OS_MACOS || BOOST_OS_IOS || BOOST_OS_ANDROID
#else // #if BOOST_OS_MACOS || BOOST_OS_IOS || BOOST_PLAT_ANDROID

// for dlinfo
#if !defined(BOOST_DLL_INTERFACE_UNIT)
Expand Down
2 changes: 1 addition & 1 deletion include/boost/dll/detail/posix/program_location_impl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ namespace boost { namespace dll { namespace detail {
}
}}} // namespace boost::dll::detail

#else // BOOST_OS_LINUX || BOOST_OS_UNIX || BOOST_OS_HPUX || BOOST_OS_ANDROID
#else // BOOST_OS_LINUX || BOOST_OS_UNIX || BOOST_OS_HPUX || BOOST_PLAT_ANDROID

namespace boost { namespace dll { namespace detail {
inline boost::dll::fs::path program_location_impl(std::error_code &ec) {
Expand Down
2 changes: 1 addition & 1 deletion include/boost/dll/detail/posix/shared_library_impl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ class shared_library_impl {
native_mode |= load_mode::rtld_local;
}

#if BOOST_OS_LINUX || BOOST_OS_ANDROID
#if BOOST_OS_LINUX || BOOST_PLAT_ANDROID
if (!sl.has_parent_path() && !(native_mode & load_mode::search_system_folders)) {
sl = "." / sl;
}
Expand Down
Loading