Skip to content

Commit

Permalink
Fixing Travis build fails
Browse files Browse the repository at this point in the history
  • Loading branch information
MichalPrincNXP committed Jun 7, 2021
1 parent a448570 commit 1429add
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
language: cpp
sudo: required
dist: trusty
dist: xenial
compiler:
- gcc
- clang
Expand All @@ -14,7 +14,7 @@ before_install:
- if [ $TRAVIS_OS_NAME == linux ]; then pyenv install 2.7.12 ; pyenv global 2.7.12; fi
- if [ $TRAVIS_OS_NAME == osx ]; then brew update; fi
- if [ $TRAVIS_OS_NAME == osx ]; then brew install python bison flex -v -f 2>&1 && brew upgrade boost || true; fi
- if [ $TRAVIS_OS_NAME == osx ]; then curl "https://bootstrap.pypa.io/get-pip.py" | sudo python; fi
- if [ $TRAVIS_OS_NAME == osx ]; then curl "https://bootstrap.pypa.io/pip/2.7/get-pip.py" | sudo python; fi

install:
#- sudo pip install --upgrade pip setuptools
Expand Down
2 changes: 1 addition & 1 deletion erpc_c/infra/erpc_transport_arbitrator.h
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ class TransportArbitrator : public Transport
* @retval The underlying transport is expected to return true when a message is available to
* process and false otherwise.
*/
virtual bool hasMessage(void);
virtual bool hasMessage(void) override;

protected:
Transport *m_sharedTransport; //!< Transport being shared through this arbitrator.
Expand Down
4 changes: 2 additions & 2 deletions erpc_c/transports/erpc_tcp_transport.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ erpc_status_t TCPTransport::connectClient(void)
struct addrinfo hints = {};
char portString[8];
struct addrinfo *res0;
int result;
int result, set;
int sock = -1;
struct addrinfo *res;

Expand Down Expand Up @@ -166,7 +166,7 @@ erpc_status_t TCPTransport::connectClient(void)

if (status == kErpcStatus_Success)
{
int set = 1;
set = 1;
if (setsockopt(sock, IPPROTO_TCP, TCP_NODELAY, (void *)&set, sizeof(int)) < 0)
{
::close(sock);
Expand Down

0 comments on commit 1429add

Please sign in to comment.