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

Added std:: where it was missing #544

Closed
wants to merge 11 commits into from
Closed

Added std:: where it was missing #544

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
d999f0c
Fixed std::lower()
Dec 3, 2015
f31dc12
Added std:: namespace for fabs()
Dec 3, 2015
4d5f7a8
Update catch_common.hpp
Dec 3, 2015
20799cc
Fixed std::isalnum()
Dec 3, 2015
5860fdf
Fixed std::memset
Dec 3, 2015
a84ca2e
Reverted std::tolower to ::tolower
Dec 3, 2015
7ae2f08
Reverted std::tolower to ::tolower
Dec 3, 2015
8472c10
Added <cctype> and std::tolower
Dec 3, 2015
8c80abe
Added <cctype> and std::tolower
Dec 3, 2015
bcab445
Fixed std::tolower ambiguity
Dec 3, 2015
998e801
Fixed std::tolower overload ambiguity
Dec 3, 2015
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
3 changes: 2 additions & 1 deletion include/external/clara.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
#define TBC_TEXT_FORMAT_H_INCLUDED
#endif

#include <cctype>
#include <string>
#include <vector>
#include <sstream>
Expand Down Expand Up @@ -232,7 +233,7 @@ namespace Clara {
}
inline void convertInto( std::string const& _source, bool& _dest ) {
std::string sourceLC = _source;
std::transform( sourceLC.begin(), sourceLC.end(), sourceLC.begin(), ::tolower );
std::transform( sourceLC.begin(), sourceLC.end(), sourceLC.begin(), static_cast<int(*)(int)>(std::tolower) );
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this doesn't look good to me...

if( sourceLC == "y" || sourceLC == "1" || sourceLC == "true" || sourceLC == "yes" || sourceLC == "on" )
_dest = true;
else if( sourceLC == "n" || sourceLC == "0" || sourceLC == "false" || sourceLC == "no" || sourceLC == "off" )
Expand Down
2 changes: 1 addition & 1 deletion include/internal/catch_approx.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ namespace Detail {

friend bool operator == ( double lhs, Approx const& rhs ) {
// Thanks to Richard Harris for his help refining this formula
return fabs( lhs - rhs.m_value ) < rhs.m_epsilon * (rhs.m_scale + (std::max)( fabs(lhs), fabs(rhs.m_value) ) );
return std::fabs( lhs - rhs.m_value ) < rhs.m_epsilon * (rhs.m_scale + (std::max)( std::fabs(lhs), std::fabs(rhs.m_value) ) );
}

friend bool operator == ( Approx const& lhs, double rhs ) {
Expand Down
4 changes: 3 additions & 1 deletion include/internal/catch_common.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
#ifndef TWOBLUECUBES_CATCH_COMMON_HPP_INCLUDED
#define TWOBLUECUBES_CATCH_COMMON_HPP_INCLUDED

#include <cctype>

#include "catch_common.h"

namespace Catch {
Expand All @@ -22,7 +24,7 @@ namespace Catch {
return s.find( infix ) != std::string::npos;
}
void toLowerInPlace( std::string& s ) {
std::transform( s.begin(), s.end(), s.begin(), ::tolower );
std::transform( s.begin(), s.end(), s.begin(), static_cast<int(*)(int)>(std::tolower) );
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same here

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will the code work with just &std::tolower instead of this mostrosity?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

std::tolower should already be int std::tolower(int) - so the cast is a best superfluous, and at worst is undefined behaviour at worst.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's also charT tolower( charT ch, const locale& loc ); in <locale>, so we're better off using a lambda anyway

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can't use lambdas due to C++-03 compatibility.
I think the answer might be along similar lines, though - go via a(n out of line) forwarding function.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

From what I can gather this was the only resolution. it is not undefined behavior. It is required to resolve the ambiguity due to the two different impleemntations of std::tolower as @nabijaczleweli mentions there is a second and is the reason why I had issues. The cast is there to tell the compiler to select the desired function, if there isn't a matching function.

If it really isn't liked (i wasn't toosure either) then creating a function object which calls std::tolower internally would be a practical way to resolve this.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Another reasonable approach might be:

int (*tolowerp)(int) = std::tolower;
std::transform( s.begin(), s.end(), s.begin(), tolowerp );

That will select the correct overload, but avoids actually writing static_cast.

}
std::string toLower( std::string const& s ) {
std::string lc = s;
Expand Down
2 changes: 1 addition & 1 deletion include/internal/catch_test_case_info.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ namespace Catch {
return TestCaseInfo::None;
}
inline bool isReservedTag( std::string const& tag ) {
return parseSpecialTag( tag ) == TestCaseInfo::None && tag.size() > 0 && !isalnum( tag[0] );
return parseSpecialTag( tag ) == TestCaseInfo::None && tag.size() > 0 && !std::isalnum( tag[0] );
}
inline void enforceNotReservedTag( std::string const& tag, SourceLineInfo const& _lineInfo ) {
if( isReservedTag( tag ) ) {
Expand Down
2 changes: 1 addition & 1 deletion include/reporters/catch_reporter_bases.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ namespace Catch {
char const* getLineOfChars() {
static char line[CATCH_CONFIG_CONSOLE_WIDTH] = {0};
if( !*line ) {
memset( line, C, CATCH_CONFIG_CONSOLE_WIDTH-1 );
std::memset( line, C, CATCH_CONFIG_CONSOLE_WIDTH-1 );
line[CATCH_CONFIG_CONSOLE_WIDTH-1] = 0;
}
return line;
Expand Down