Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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/arch/festival/server.cc
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ int festival_start_server(int port)
serv_addr.sin_port = htons(port);
serv_addr.sin_addr.s_addr = htonl(INADDR_ANY);

if (bind(fd, (struct sockaddr *)&serv_addr, sizeof(serv_addr)) != 0)
if (::bind(fd, (struct sockaddr *)&serv_addr, sizeof(serv_addr)) != 0)
{
cerr << "socket: bind failed" << endl;
festival_error();
Expand Down
3 changes: 2 additions & 1 deletion src/modules/clunits/acost.cc
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
/* */
/*=======================================================================*/
#include <cstdlib>
#include <cmath>
#include "festival.h"
#include "clunits.h"

Expand Down Expand Up @@ -196,7 +197,7 @@ static void cumulate_ss_frames(EST_Track *a,EST_SuffStats *ss_frames)
for (j=0; j < a->num_channels(); j++)
{
p = a->a_no_check(i,j);
if (!finite(p))
if (!std::isfinite(p))
{
p = 1.0e5;
a->a_no_check(i,j) = p;
Expand Down