bindings: cxx: prepend all C symbols with the scope resolution operator

We explicitly resolve all global C symbols from libgpiod to the top-level
namespace. Fix it wherever its missing (mostly for C enum types).

Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>

diff --git a/bindings/cxx/line-request.cpp b/bindings/cxx/line-request.cpp
index 34c585096867d281abb0de38e9810158298e20ee..b52ceaf81c2afa719ff13d762382d00371ec2585 100644 (file)
--- a/bindings/cxx/line-request.cpp
+++ b/bindings/cxx/line-request.cpp
@@ -118,7 +118,7 @@ GPIOD_CXX_API void line_request::get_values(const line::offsets& offsets, line::
        int ret = ::gpiod_line_request_get_values_subset(
                                        this->_m_priv->request.get(),
                                        offsets.size(), this->_m_priv->offset_buf.data(),
-                                       reinterpret_cast<gpiod_line_value*>(values.data()));
+                                       reinterpret_cast<::gpiod_line_value*>(values.data()));
        if (ret)
                throw_from_errno("unable to retrieve line values");
 }
@@ -161,7 +161,7 @@ GPIOD_CXX_API line_request& line_request::set_values(const line::offsets& offset
        int ret = ::gpiod_line_request_set_values_subset(
                                        this->_m_priv->request.get(),
                                        offsets.size(), this->_m_priv->offset_buf.data(),
-                                       reinterpret_cast<const enum gpiod_line_value*>(values.data()));
+                                       reinterpret_cast<const ::gpiod_line_value*>(values.data()));
        if (ret)
                throw_from_errno("unable to set line values");
 

diff --git a/bindings/cxx/line-settings.cpp b/bindings/cxx/line-settings.cpp
index 7d3d6a56dbd1232c77a153df62ce0e5c59de0a0d..5ded953b76838a3e3ba5dea54fea0afcbab5960e 100644 (file)
--- a/bindings/cxx/line-settings.cpp
+++ b/bindings/cxx/line-settings.cpp
@@ -22,56 +22,60 @@ make_reverse_maping(const ::std::map<cxx_enum_type, c_enum_type>& mapping)
        return ret;
 }
 
-const ::std::map<line::direction, gpiod_line_direction> direction_mapping = {
+const ::std::map<line::direction, ::gpiod_line_direction> direction_mapping = {
        { line::direction::AS_IS,       GPIOD_LINE_DIRECTION_AS_IS },
        { line::direction::INPUT,       GPIOD_LINE_DIRECTION_INPUT },
        { line::direction::OUTPUT,      GPIOD_LINE_DIRECTION_OUTPUT },
 };
 
-const ::std::map<gpiod_line_direction, line::direction>
+const ::std::map<::gpiod_line_direction, line::direction>
 reverse_direction_mapping = make_reverse_maping(direction_mapping);
 
-const ::std::map<line::edge, gpiod_line_edge> edge_mapping = {
+const ::std::map<line::edge, ::gpiod_line_edge> edge_mapping = {
        { line::edge::NONE,             GPIOD_LINE_EDGE_NONE },
        { line::edge::FALLING,          GPIOD_LINE_EDGE_FALLING },
        { line::edge::RISING,           GPIOD_LINE_EDGE_RISING },
        { line::edge::BOTH,             GPIOD_LINE_EDGE_BOTH },
 };
 
-const ::std::map<gpiod_line_edge, line::edge> reverse_edge_mapping = make_reverse_maping(edge_mapping);
+const ::std::map<::gpiod_line_edge, line::edge>
+reverse_edge_mapping = make_reverse_maping(edge_mapping);
 
-const ::std::map<line::bias, gpiod_line_bias> bias_mapping = {
+const ::std::map<line::bias, ::gpiod_line_bias> bias_mapping = {
        { line::bias::AS_IS,            GPIOD_LINE_BIAS_AS_IS },
        { line::bias::DISABLED,         GPIOD_LINE_BIAS_DISABLED },
        { line::bias::PULL_UP,          GPIOD_LINE_BIAS_PULL_UP },
        { line::bias::PULL_DOWN,        GPIOD_LINE_BIAS_PULL_DOWN },
 };
 
-const ::std::map<gpiod_line_bias, line::bias> reverse_bias_mapping = make_reverse_maping(bias_mapping);
+const ::std::map<::gpiod_line_bias, line::bias>
+reverse_bias_mapping = make_reverse_maping(bias_mapping);
 
-const ::std::map<line::drive, gpiod_line_drive> drive_mapping = {
+const ::std::map<line::drive, ::gpiod_line_drive> drive_mapping = {
        { line::drive::PUSH_PULL,       GPIOD_LINE_DRIVE_PUSH_PULL },
        { line::drive::OPEN_DRAIN,      GPIOD_LINE_DRIVE_OPEN_DRAIN },
        { line::drive::OPEN_SOURCE,     GPIOD_LINE_DRIVE_OPEN_SOURCE },
 };
 
-const ::std::map<gpiod_line_drive, line::drive> reverse_drive_mapping = make_reverse_maping(drive_mapping);
+const ::std::map<::gpiod_line_drive, line::drive>
+reverse_drive_mapping = make_reverse_maping(drive_mapping);
 
-const ::std::map<line::clock, gpiod_line_clock> clock_mapping = {
+const ::std::map<line::clock, ::gpiod_line_clock> clock_mapping = {
        { line::clock::MONOTONIC,       GPIOD_LINE_CLOCK_MONOTONIC },
        { line::clock::REALTIME,        GPIOD_LINE_CLOCK_REALTIME },
        { line::clock::HTE,             GPIOD_LINE_CLOCK_HTE },
 };
 
-const ::std::map<gpiod_line_clock, line::clock>
+const ::std::map<::gpiod_line_clock, line::clock>
 reverse_clock_mapping = make_reverse_maping(clock_mapping);
 
-const ::std::map<line::value, gpiod_line_value> value_mapping = {
+const ::std::map<line::value, ::gpiod_line_value> value_mapping = {
        { line::value::INACTIVE,        GPIOD_LINE_VALUE_INACTIVE },
        { line::value::ACTIVE,          GPIOD_LINE_VALUE_ACTIVE },
 };
 
-const ::std::map<gpiod_line_value, line::value> reverse_value_mapping = make_reverse_maping(value_mapping);
+const ::std::map<::gpiod_line_value, line::value>
+reverse_value_mapping = make_reverse_maping(value_mapping);
 
 line_settings_ptr make_line_settings()
 {
@@ -165,7 +169,7 @@ GPIOD_CXX_API line_settings& line_settings::reset(void) noexcept
 
 GPIOD_CXX_API line_settings& line_settings::set_direction(line::direction direction)
 {
-       set_mapped_value<line::direction, gpiod_line_direction,
+       set_mapped_value<line::direction, ::gpiod_line_direction,
                         ::gpiod_line_settings_set_direction>(this->_m_priv->settings.get(),
                                                              direction, direction_mapping);
 
@@ -174,7 +178,7 @@ GPIOD_CXX_API line_settings& line_settings::set_direction(line::direction direct
 
 GPIOD_CXX_API line::direction line_settings::direction() const
 {
-       return get_mapped_value<line::direction, gpiod_line_direction,
+       return get_mapped_value<line::direction, ::gpiod_line_direction,
                                ::gpiod_line_settings_get_direction>(
                                                        this->_m_priv->settings.get(),
                                                        reverse_direction_mapping);
@@ -182,7 +186,7 @@ GPIOD_CXX_API line::direction line_settings::direction() const
 
 GPIOD_CXX_API line_settings& line_settings::set_edge_detection(line::edge edge)
 {
-       set_mapped_value<line::edge, gpiod_line_edge,
+       set_mapped_value<line::edge, ::gpiod_line_edge,
                         ::gpiod_line_settings_set_edge_detection>(this->_m_priv->settings.get(),
                                                                   edge, edge_mapping);
 
@@ -191,7 +195,7 @@ GPIOD_CXX_API line_settings& line_settings::set_edge_detection(line::edge edge)
 
 GPIOD_CXX_API line::edge line_settings::edge_detection() const
 {
-       return get_mapped_value<line::edge, gpiod_line_edge,
+       return get_mapped_value<line::edge, ::gpiod_line_edge,
                                ::gpiod_line_settings_get_edge_detection>(
                                                        this->_m_priv->settings.get(),
                                                        reverse_edge_mapping);
@@ -199,7 +203,7 @@ GPIOD_CXX_API line::edge line_settings::edge_detection() const
 
 GPIOD_CXX_API line_settings& line_settings::set_bias(line::bias bias)
 {
-       set_mapped_value<line::bias, gpiod_line_bias,
+       set_mapped_value<line::bias, ::gpiod_line_bias,
                         ::gpiod_line_settings_set_bias>(this->_m_priv->settings.get(),
                                                         bias, bias_mapping);
 
@@ -208,14 +212,14 @@ GPIOD_CXX_API line_settings& line_settings::set_bias(line::bias bias)
 
 GPIOD_CXX_API line::bias line_settings::bias() const
 {
-       return get_mapped_value<line::bias, gpiod_line_bias,
+       return get_mapped_value<line::bias, ::gpiod_line_bias,
                                ::gpiod_line_settings_get_bias>(this->_m_priv->settings.get(),
                                                                reverse_bias_mapping);
 }
 
 GPIOD_CXX_API line_settings& line_settings::set_drive(line::drive drive)
 {
-       set_mapped_value<line::drive, gpiod_line_drive,
+       set_mapped_value<line::drive, ::gpiod_line_drive,
                         ::gpiod_line_settings_set_drive>(this->_m_priv->settings.get(),
                                                          drive, drive_mapping);
 
@@ -224,7 +228,7 @@ GPIOD_CXX_API line_settings& line_settings::set_drive(line::drive drive)
 
 GPIOD_CXX_API line::drive line_settings::drive() const
 {
-       return get_mapped_value<line::drive, gpiod_line_drive,
+       return get_mapped_value<line::drive, ::gpiod_line_drive,
                                ::gpiod_line_settings_get_drive>(this->_m_priv->settings.get(),
                                                                 reverse_drive_mapping);
 }
@@ -257,7 +261,7 @@ GPIOD_CXX_API ::std::chrono::microseconds line_settings::debounce_period() const
 
 GPIOD_CXX_API line_settings& line_settings::set_event_clock(line::clock event_clock)
 {
-       set_mapped_value<line::clock, gpiod_line_clock,
+       set_mapped_value<line::clock, ::gpiod_line_clock,
                         ::gpiod_line_settings_set_event_clock>(this->_m_priv->settings.get(),
                                                                event_clock, clock_mapping);
 
@@ -266,7 +270,7 @@ GPIOD_CXX_API line_settings& line_settings::set_event_clock(line::clock event_cl
 
 GPIOD_CXX_API line::clock line_settings::event_clock() const
 {
-       return get_mapped_value<line::clock, gpiod_line_clock,
+       return get_mapped_value<line::clock, ::gpiod_line_clock,
                                ::gpiod_line_settings_get_event_clock>(
                                                        this->_m_priv->settings.get(),
                                                        reverse_clock_mapping);
@@ -274,7 +278,7 @@ GPIOD_CXX_API line::clock line_settings::event_clock() const
 
 GPIOD_CXX_API line_settings& line_settings::set_output_value(line::value value)
 {
-       set_mapped_value<line::value, gpiod_line_value,
+       set_mapped_value<line::value, ::gpiod_line_value,
                         ::gpiod_line_settings_set_output_value>(this->_m_priv->settings.get(),
                                                                 value, value_mapping);
 
@@ -283,7 +287,7 @@ GPIOD_CXX_API line_settings& line_settings::set_output_value(line::value value)
 
 GPIOD_CXX_API line::value line_settings::output_value() const
 {
-       return get_mapped_value<line::value, gpiod_line_value,
+       return get_mapped_value<line::value, ::gpiod_line_value,
                                ::gpiod_line_settings_get_output_value>(
                                                        this->_m_priv->settings.get(),
                                                        reverse_value_mapping);