Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
home:inescid:language
phnrec
phnrec-gcc-4.5.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File phnrec-gcc-4.5.patch of Package phnrec
diff -Naru ./configz.cpp ../phnrec-2.20/configz.cpp --- ./configz.cpp 2006-03-10 00:01:44.000000000 +0000 +++ ../phnrec-2.20/configz.cpp 2010-09-02 12:14:03.722429671 +0100 @@ -13,6 +13,7 @@ #include <stdio.h> #include <assert.h> +#include <cstring> #include "configz.h" Config::Config() : diff -Naru ./gptrans.cpp ../phnrec-2.20/gptrans.cpp --- ./gptrans.cpp 2006-03-05 13:40:04.000000000 +0000 +++ ../phnrec-2.20/gptrans.cpp 2010-09-02 12:16:13.410436612 +0100 @@ -14,6 +14,7 @@ #include <stdio.h> #include <stdlib.h> #include <assert.h> +#include <cstring> #include "gptrans.h" GPTrans::GPTrans() : diff -Naru ./kwsnetg.cpp ../phnrec-2.20/kwsnetg.cpp --- ./kwsnetg.cpp 2006-03-10 00:19:48.000000000 +0000 +++ ../phnrec-2.20/kwsnetg.cpp 2010-09-02 12:14:43.318430650 +0100 @@ -16,6 +16,7 @@ #include "encode.h" #include <stdlib.h> #include <assert.h> +#include <cstring> KWSNetGenerator::KWSNetGenerator() : PT(0), diff -Naru ./lexicon.cpp ../phnrec-2.20/lexicon.cpp --- ./lexicon.cpp 2006-03-05 13:40:02.000000000 +0000 +++ ../phnrec-2.20/lexicon.cpp 2010-09-02 12:15:59.394429799 +0100 @@ -12,6 +12,7 @@ **************************************************************************/ #include <assert.h> +#include <cstring> #include "lexicon.h" #include "filename.h" #include "encode.h" diff -Naru ./lexicon.h ../phnrec-2.20/lexicon.h --- ./lexicon.h 2006-03-09 23:21:36.000000000 +0000 +++ ../phnrec-2.20/lexicon.h 2010-09-02 12:15:23.063888889 +0100 @@ -18,6 +18,7 @@ #include <list> #include <map> #include <set> +#include <limits.h> // error codes #define LEX_OK 0 diff -Naru ./makefile.lin ../phnrec-2.20/makefile.lin --- ./makefile.lin 2006-10-31 22:44:26.000000000 +0000 +++ ../phnrec-2.20/makefile.lin 2010-09-02 13:15:44.910486997 +0100 @@ -15,8 +15,8 @@ ############################################################################### # linker options -LDFLAGS = -L$(STKLIB) -LDLIBS = -lSTKLib -l pthread -l cblas -l atlas +LDFLAGS = -L$(STKLIB) -L$(ATLASLIBDIR) +LDLIBS = -lSTKLib -l pthread -l cblas -l atlas -llapack ############################################################################### diff -Naru ./netgen.cpp ../phnrec-2.20/netgen.cpp --- ./netgen.cpp 2006-03-05 13:40:02.000000000 +0000 +++ ../phnrec-2.20/netgen.cpp 2010-09-02 12:14:21.982433892 +0100 @@ -15,6 +15,7 @@ #include <assert.h> #include <string> #include <list> +#include <cstring> #include "netgen.h" diff -Naru ./nn.cpp ../phnrec-2.20/nn.cpp --- ./nn.cpp 2006-11-02 22:44:36.000000000 +0000 +++ ../phnrec-2.20/nn.cpp 2010-09-02 12:13:35.546428663 +0100 @@ -623,7 +623,7 @@ float *NeuralNet::MemAlign16(float *pBuff) { char *pbuff = (char *)pBuff; - while(((unsigned int)pbuff & 0xF) != 0) + while(((unsigned long)pbuff & 0xF) != 0) { pbuff++; } diff -Naru ./norm.cpp ../phnrec-2.20/norm.cpp --- ./norm.cpp 2006-03-10 00:25:20.000000000 +0000 +++ ../phnrec-2.20/norm.cpp 2010-09-02 12:18:58.803036818 +0100 @@ -3,6 +3,9 @@ #include <assert.h> #include <math.h> #include <string> +#include <cstring> +#include <cstdlib> +#include <limits.h> ChannelNormParams::ChannelNormParams() : mFrameLength(0), diff -Naru ./phntranscheck.cpp ../phnrec-2.20/phntranscheck.cpp --- ./phntranscheck.cpp 2006-03-05 13:40:04.000000000 +0000 +++ ../phnrec-2.20/phntranscheck.cpp 2010-09-02 12:16:35.366433210 +0100 @@ -12,6 +12,7 @@ **************************************************************************/ #include <stdio.h> +#include <cstring> #include "phntranscheck.h" PhnTransChecker::PhnTransChecker() : diff -Naru ./srec.h ../phnrec-2.20/srec.h --- ./srec.h 2006-11-03 00:20:38.000000000 +0000 +++ ../phnrec-2.20/srec.h 2010-09-02 12:12:59.782549304 +0100 @@ -125,7 +125,7 @@ ParamKindType Str2ParamKind(char *str); // softening function - typedef float (*soft_func)(float v1, float v2, float v3, float v4); + //DAVID: multiple decl: typedef float (*soft_func)(float v1, float v2, float v3, float v4); public: // default handlers diff -Naru ./STKLib/common.C ../phnrec-2.20/STKLib/common.C --- ./STKLib/common.C 2006-03-10 15:05:34.000000000 +0000 +++ ../phnrec-2.20/STKLib/common.C 2010-09-02 11:27:01.242437265 +0100 @@ -1199,7 +1199,7 @@ } if (opt == 'A') continue; - chptr = strstr(pOptionMapping, tstr); + chptr = (char*)strstr(pOptionMapping, tstr); if (chptr == NULL) Error("Invalid command line option '-%c'", opt); chptr += 3; diff -Naru ./STKLib/Error.cc ../phnrec-2.20/STKLib/Error.cc --- ./STKLib/Error.cc 2006-03-05 13:42:40.000000000 +0000 +++ ../phnrec-2.20/STKLib/Error.cc 2010-09-02 11:28:19.894810117 +0100 @@ -12,7 +12,8 @@ #include "Error.h" #include <stdarg.h> -#include <stdio.h> +#include <cstdio> +#include <cstdlib> namespace STK diff -Naru ./STKLib/fileio.C ../phnrec-2.20/STKLib/fileio.C --- ./STKLib/fileio.C 2006-03-05 13:42:40.000000000 +0000 +++ ../phnrec-2.20/STKLib/fileio.C 2010-09-02 11:28:37.334927511 +0100 @@ -202,7 +202,7 @@ char dir_name[260]; char * chptr; - if ((chptr=strrchr(pFileName, '/')) == NULL) + if ((chptr=(char*)strrchr(pFileName, '/')) == NULL) return 0; diff -Naru ./STKLib/Makefile.lin ../phnrec-2.20/STKLib/Makefile.lin --- ./STKLib/Makefile.lin 2006-03-10 16:02:22.000000000 +0000 +++ ../phnrec-2.20/STKLib/Makefile.lin 2010-09-02 11:32:43.706561462 +0100 @@ -4,7 +4,8 @@ ############################################################################## # compiler options -CFLAGS = -Wall -g -DDOUBLEPRECISION=0 -D_REENTRANT -DUSE_BLAS +CFLAGS = -Wall -DDOUBLEPRECISION=0 -D_REENTRANT -DUSE_BLAS +CFLAGS+= -O3 -msse2 -msse3 -mssse3 -msse4 -msse4.1 -msse4.2 -w CXXFLAGS = $(CFLAGS) ############################################################################### @@ -17,8 +18,8 @@ # compiler binary # CROSS_COMPILE ?= x86_64-linux- -CC := $(CROSS_COMPILE)g++-4.1 -CXX := $(CROSS_COMPILE)g++-4.1 +CC := $(CROSS_COMPILE)g++ +CXX := $(CROSS_COMPILE)g++ ############################################################################### diff -Naru ./STKLib/Matrix.cc ../phnrec-2.20/STKLib/Matrix.cc --- ./STKLib/Matrix.cc 2006-03-10 15:05:34.000000000 +0000 +++ ../phnrec-2.20/STKLib/Matrix.cc 2010-09-02 11:29:08.806562304 +0100 @@ -4,6 +4,7 @@ * Implementation of specialized Matrix template methods */ +#include <cstring> #include "Matrix.h" diff -Naru ./STKLib/stkstream.tcc ../phnrec-2.20/STKLib/stkstream.tcc --- ./STKLib/stkstream.tcc 2006-03-05 13:42:40.000000000 +0000 +++ ../phnrec-2.20/STKLib/stkstream.tcc 2010-09-02 11:27:48.002428804 +0100 @@ -2,6 +2,7 @@ #define STK_StkStream_tcc #include <iostream> +#include <cstring> #pragma GCC system_header namespace STK diff -Naru ./sxmlparser.cpp ../phnrec-2.20/sxmlparser.cpp --- ./sxmlparser.cpp 2006-11-02 23:07:06.000000000 +0000 +++ ../phnrec-2.20/sxmlparser.cpp 2010-09-02 12:21:00.874554430 +0100 @@ -1,6 +1,8 @@ #include <assert.h> #include <stdio.h> #include <string> +#include <cstring> +#include <cstdlib> #ifdef WIN32 #include <io.h> diff -Naru ./sxmlparser.h ../phnrec-2.20/sxmlparser.h --- ./sxmlparser.h 2006-03-05 13:40:04.000000000 +0000 +++ ../phnrec-2.20/sxmlparser.h 2010-09-02 12:20:37.926933930 +0100 @@ -43,6 +43,7 @@ }; // XML node +class SXMLDocument; class SXMLNode { public: @@ -101,6 +102,7 @@ }; // XML document +class SXMLNode; class SXMLDocument { public: diff -Naru ./thresholds.cpp ../phnrec-2.20/thresholds.cpp --- ./thresholds.cpp 2006-03-05 13:40:04.000000000 +0000 +++ ../phnrec-2.20/thresholds.cpp 2010-09-02 12:15:45.722637221 +0100 @@ -12,6 +12,7 @@ **************************************************************************/ #include <stdio.h> +#include <cstring> #include "thresholds.h"
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor