Skip to content

Fix compilation on GCC #5

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

Merged
merged 2 commits into from
Apr 14, 2015
Merged

Fix compilation on GCC #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ff681b
Avoid symbol redefinition
lniccoli Apr 14, 2015
2924a9f
Use explicit template parametrization
lniccoli Apr 14, 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
2 changes: 1 addition & 1 deletion src/internal/sio_client_impl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ namespace sio
unsigned client_impl::next_delay() const
{
//no jitter, fixed power root.
return (unsigned)min(m_reconn_delay * pow(1.5,m_reconn_made),m_reconn_delay_max);
return min<unsigned>(m_reconn_delay * pow(1.5,m_reconn_made),m_reconn_delay_max);
}

void client_impl::send(packet& p)
Expand Down
2 changes: 1 addition & 1 deletion src/internal/sio_client_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ void set_##__FIELD__(__TYPE__ const& l) \
// Client Functions - such as send, etc.
void connect(const std::string& uri);

socket::ptr const& socket(const std::string& nsp);
::sio::socket::ptr const& socket(const std::string& nsp);

// Closes the connection
void close();
Expand Down
2 changes: 1 addition & 1 deletion src/sio_client.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ namespace sio

void set_reconnect_delay_max(unsigned millis);

socket::ptr const& socket(const std::string& nsp = "");
::sio::socket::ptr const& socket(const std::string& nsp = "");

// Closes the connection
void close();
Expand Down