ps/hermes
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix build issues on newer compilers

Browse source
This commit is contained in:
Juan José Gutiérrez de Quevedo Pérez 2019-10-20 22:01:30 +02:00
parent 8652af728d
commit ad0a63e275
6 changed files with 20 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/Socket.cpp
View file

@ -19,6 +19,7 @@
*/
#include "Socket.h"
#include <unistd.h>
#include <cstring>
int Socket::created_sockets=0;
@ -309,6 +310,10 @@ string Socket::readLine()
{
char c=0;
stringstream s;
string ssl_debug_string="";
#ifdef HAVE_SSL
if (ssl_enabled) ssl_debug_string = "s";
#endif //HAVE_SSL
do
{
@ -319,11 +324,7 @@ string Socket::readLine()
}
while(c!=10&&!isClosed());
LDEB(string("r") +
#ifdef HAVE_SSL
string(ssl_enabled?"s":"") +
#endif //HAVE_SSL
">" + s.str());
LDEB(string("r") + ssl_debug_string + ">" + s.str());
return s.str();
}
@ -372,12 +373,12 @@ void Socket::writeByte(char c)
void Socket::writeLine(string s)
{
LDEB(string("w") +
string ssl_debug_string="";
#ifdef HAVE_SSL
string(ssl_enabled?"s":"") +
if (ssl_enabled) ssl_debug_string = "s";
#endif //HAVE_SSL
">" + s);
LDEB(string("w") + ssl_debug_string + ">" + s);
s+="\r\n";
writeBytes((void *)s.c_str(),s.length());