From d01aacd454d9e478935f3396901f57cae06c3da7 Mon Sep 17 00:00:00 2001 From: Anton Bachin Date: Sat, 23 May 2015 10:14:59 -0500 Subject: [PATCH] Prefixed .to_* methods with underscores to avoid name conflicts. --- enum.h | 8 ++++---- example/1-basic.cc | 8 ++++---- example/2-iterate.cc | 2 +- example/4-constexpr.cc | 8 ++++---- example/5-containers.cc | 6 +++--- example/6-traits.cc | 6 +++--- example/7-bitset.cc | 6 +++--- test/cxxtest/tests.h | 16 ++++++++-------- test/link/helper.cc | 2 +- 9 files changed, 31 insertions(+), 31 deletions(-) diff --git a/enum.h b/enum.h index ee295df..fb3220e 100644 --- a/enum.h +++ b/enum.h @@ -555,7 +555,7 @@ class EnumType : public _ENUM_NS(EnumType)::_Base { \ constexpr EnumType(_enumerated value) : _Base(value) { } \ constexpr EnumType(_ENUM_NS(EnumType)::_Base value) : _Base(value) { } \ \ - constexpr _integral to_integral() const \ + constexpr _integral _to_integral() const \ { \ return _value; \ } \ @@ -579,7 +579,7 @@ class EnumType : public _ENUM_NS(EnumType)::_Base { \ return (_enumerated)value; \ } \ \ - constexpr const char* to_string() const \ + constexpr const char* _to_string() const \ { \ return \ _enum::_or_throw( \ @@ -710,7 +710,7 @@ class EnumType : public _ENUM_NS(EnumType)::_Base { \ \ static const size_t _size = _ENUM_NS(EnumType)::_size; \ \ - _integral to_integral() const \ + _integral _to_integral() const \ { \ return _value; \ } \ @@ -738,7 +738,7 @@ class EnumType : public _ENUM_NS(EnumType)::_Base { \ return (_enumerated)value; \ } \ \ - const char* to_string() const \ + const char* _to_string() const \ { \ _optional_index index = _value_to_index(_value); \ if (!index) \ diff --git a/example/1-basic.cc b/example/1-basic.cc index 074a0a1..feee8b1 100644 --- a/example/1-basic.cc +++ b/example/1-basic.cc @@ -11,9 +11,9 @@ void print_channel(Channel channel) { std::cout << "channel \'" - << channel.to_string() + << channel._to_string() << "\' has value " - << channel.to_integral() + << channel._to_integral() << std::endl; } @@ -85,10 +85,10 @@ int main() // values of type Channel, but of type Channel::_Enumerated, and the // compiler isn't always able to implicitly promote the latter to the // former. + is used to force the promotion. - std::cout << (+Channel::Green).to_string() << std::endl; + std::cout << (+Channel::Green)._to_string() << std::endl; // This will not work. - // std::cout << (Channel::Green).to_string() << std::endl; + // std::cout << (Channel::Green)._to_string() << std::endl; diff --git a/example/2-iterate.cc b/example/2-iterate.cc index 2307ca8..c36327d 100644 --- a/example/2-iterate.cc +++ b/example/2-iterate.cc @@ -9,7 +9,7 @@ int main() { // Listing declared values. Output is 3 4 0. for (Channel channel : Channel::_values) - std::cout << channel.to_integral() << " "; + std::cout << channel._to_integral() << " "; std::cout << std::endl; // Listing declared names. Output is Red Green Blue. diff --git a/example/4-constexpr.cc b/example/4-constexpr.cc index db85d8e..3956e2a 100644 --- a/example/4-constexpr.cc +++ b/example/4-constexpr.cc @@ -17,8 +17,8 @@ constexpr Channel channel_2 = Channel::_from_string("Blue"); constexpr Channel channel_3 = Channel::_from_string_nocase("gReEn"); // Conversions to integers and strings. -constexpr int channel_1_representation = channel_1.to_integral(); -constexpr const char *channel_1_name = channel_1.to_string(); +constexpr int channel_1_representation = channel_1._to_integral(); +constexpr const char *channel_1_name = channel_1._to_string(); // Validity checks (including against strings). constexpr bool should_be_valid_1 = Channel::_is_valid(2); @@ -39,7 +39,7 @@ constexpr const char *name_through_subscript = Channel::_names[2]; constexpr auto name = Channel::_name; // Explicit promotion. -constexpr int converted = (+Channel::Green).to_integral(); +constexpr int converted = (+Channel::Green)._to_integral(); @@ -50,7 +50,7 @@ void print_channel(int number, Channel channel) << "channel_" << number << " is " - << channel.to_string() + << channel._to_string() << std::endl; } diff --git a/example/5-containers.cc b/example/5-containers.cc index 367411a..d0c30cd 100644 --- a/example/5-containers.cc +++ b/example/5-containers.cc @@ -19,7 +19,7 @@ int main() vector.push_back(Channel::Red); for (Channel channel : vector) - std::cout << channel.to_string() << " "; + std::cout << channel._to_string() << " "; std::cout << std::endl; @@ -31,7 +31,7 @@ int main() map.insert({"second", Channel::Green}); for (Channel channel : Channel::_values) - map.insert({channel.to_string(), channel}); + map.insert({channel._to_string(), channel}); bool first = true; for (auto item : map) { @@ -43,7 +43,7 @@ int main() std::cout << item.first << " -> " - << item.second.to_string(); + << item.second._to_string(); } std::cout << std::endl; diff --git a/example/6-traits.cc b/example/6-traits.cc index c80ec22..ede3857 100644 --- a/example/6-traits.cc +++ b/example/6-traits.cc @@ -41,10 +41,10 @@ int main() // default value is still declared in one place, not all over the program // code. Depth depth = default_(); - std::cout << depth.to_string() << std::endl; + std::cout << depth._to_string() << std::endl; - std::cout << default_().to_string() << std::endl; - std::cout << default_().to_string() << std::endl; + std::cout << default_()._to_string() << std::endl; + std::cout << default_()._to_string() << std::endl; return 0; } diff --git a/example/7-bitset.cc b/example/7-bitset.cc index 1625841..68f08b3 100644 --- a/example/7-bitset.cc +++ b/example/7-bitset.cc @@ -19,7 +19,7 @@ ENUM(Channel, int, Red, Green, Blue) int main() { - using ChannelSet = std::bitset().to_integral() + 1>; + using ChannelSet = std::bitset()._to_integral() + 1>; ChannelSet red_only; red_only.set(Channel::Red); @@ -31,9 +31,9 @@ int main() for (Channel channel : Channel::_values) { std::cout - << channel.to_string() + << channel._to_string() << " bit is set to " - << red_and_blue[channel.to_integral()] + << red_and_blue[channel._to_integral()] << std::endl; } diff --git a/test/cxxtest/tests.h b/test/cxxtest/tests.h index 8d15706..a6f4340 100644 --- a/test/cxxtest/tests.h +++ b/test/cxxtest/tests.h @@ -75,11 +75,11 @@ static_assert_1(!(std::is_convertible