Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
home:inescid:language
irstlm
fix-c++-includes.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File fix-c++-includes.patch of Package irstlm
diff -rU3 irstlm-5.80.08/trunk/src/CMakeLists.txt irstlm-5.80.08.new/trunk/src/CMakeLists.txt --- irstlm-5.80.08/trunk/src/CMakeLists.txt 2015-01-10 16:36:16.000000001 +0000 +++ irstlm-5.80.08.new/trunk/src/CMakeLists.txt 2018-08-19 16:56:35.000000001 +0100 @@ -7,7 +7,7 @@ ADD_DEFINITIONS("-DMYCODESIZE=3") ADD_DEFINITIONS("-DDEBUG") -SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -isystem/usr/include -W -Wall -ffor-scope") +SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -W -Wall -ffor-scope") SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS}") INCLUDE_DIRECTORIES("${PROJECT_SOURCE_DIR}/src") diff -rU3 irstlm-5.80.08/trunk/src/cmd.h irstlm-5.80.08.new/trunk/src/cmd.h --- irstlm-5.80.08/trunk/src/cmd.h 2014-05-15 07:33:10.000000001 +0100 +++ irstlm-5.80.08.new/trunk/src/cmd.h 2018-08-19 16:56:35.000000001 +0100 @@ -58,10 +58,13 @@ #define CMDMSG (1<<31) -#include <stdio.h> #ifdef __cplusplus extern "C" { + +#include <cstdio> +#else +#include <stdio.h> #endif typedef struct { Only in irstlm-5.80.08.new/trunk/src: cmd.h.orig diff -rU3 irstlm-5.80.08/trunk/src/compile-lm.cpp irstlm-5.80.08.new/trunk/src/compile-lm.cpp --- irstlm-5.80.08/trunk/src/compile-lm.cpp 2015-02-24 09:48:34.000000001 +0000 +++ irstlm-5.80.08.new/trunk/src/compile-lm.cpp 2018-08-19 16:56:35.000000001 +0100 @@ -25,7 +25,7 @@ #include <fstream> #include <vector> #include <string> -#include <stdlib.h> +#include <cstdlib> #include "cmd.h" #include "util.h" #include "math.h" diff -rU3 irstlm-5.80.08/trunk/src/dictionary.cpp irstlm-5.80.08.new/trunk/src/dictionary.cpp --- irstlm-5.80.08/trunk/src/dictionary.cpp 2015-02-13 08:42:08.000000001 +0000 +++ irstlm-5.80.08.new/trunk/src/dictionary.cpp 2018-08-19 16:56:35.000000001 +0100 @@ -20,8 +20,8 @@ ******************************************************************************/ -#include <stdio.h> -#include <stdlib.h> +#include <cstdio> +#include <cstdlib> #include <iomanip> #include <iostream> #include <fstream> diff -rU3 irstlm-5.80.08/trunk/src/doc.cpp irstlm-5.80.08.new/trunk/src/doc.cpp --- irstlm-5.80.08/trunk/src/doc.cpp 2015-02-10 13:36:31.000000001 +0000 +++ irstlm-5.80.08.new/trunk/src/doc.cpp 2018-08-19 16:56:35.000000001 +0100 @@ -19,7 +19,7 @@ ******************************************************************************/ -#include <math.h> +#include <cmath> #include "util.h" #include "mfstream.h" #include "mempool.h" diff -rU3 irstlm-5.80.08/trunk/src/htable.cpp irstlm-5.80.08.new/trunk/src/htable.cpp --- irstlm-5.80.08/trunk/src/htable.cpp 2015-02-10 13:36:31.000000001 +0000 +++ irstlm-5.80.08.new/trunk/src/htable.cpp 2018-08-19 16:56:35.000000001 +0100 @@ -20,9 +20,9 @@ ******************************************************************************/ -#include <stdio.h> -#include <stdlib.h> -#include <string.h> +#include <cstdio> +#include <cstdlib> +#include <cstring> #include <iostream> #include "mempool.h" #include "htable.h" diff -rU3 irstlm-5.80.08/trunk/src/interpolate-lm.cpp irstlm-5.80.08.new/trunk/src/interpolate-lm.cpp --- irstlm-5.80.08/trunk/src/interpolate-lm.cpp 2015-02-16 08:16:51.000000001 +0000 +++ irstlm-5.80.08.new/trunk/src/interpolate-lm.cpp 2018-08-19 16:56:35.000000001 +0100 @@ -24,7 +24,7 @@ #include <stdexcept> #include <vector> #include <string> -#include <stdlib.h> +#include <cstdlib> #include "cmd.h" #include "util.h" #include "math.h" diff -rU3 irstlm-5.80.08/trunk/src/linearlm.cpp irstlm-5.80.08.new/trunk/src/linearlm.cpp --- irstlm-5.80.08/trunk/src/linearlm.cpp 2015-02-10 13:36:31.000000001 +0000 +++ irstlm-5.80.08.new/trunk/src/linearlm.cpp 2018-08-19 16:56:35.000000001 +0100 @@ -18,10 +18,10 @@ ******************************************************************************/ -#include <string.h> -#include <stdio.h> -#include <stdlib.h> -#include <math.h> +#include <cstring> +#include <cstdio> +#include <cstdlib> +#include <cmath> #include "mfstream.h" #include "mempool.h" #include "htable.h" diff -rU3 irstlm-5.80.08/trunk/src/lmclass.cpp irstlm-5.80.08.new/trunk/src/lmclass.cpp --- irstlm-5.80.08/trunk/src/lmclass.cpp 2015-02-10 13:36:31.000000001 +0000 +++ irstlm-5.80.08.new/trunk/src/lmclass.cpp 2018-08-19 16:56:35.000000001 +0100 @@ -19,8 +19,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ******************************************************************************/ -#include <stdio.h> -#include <stdlib.h> +#include <cstdio> +#include <cstdlib> #include <fcntl.h> #include <iostream> #include <fstream> diff -rU3 irstlm-5.80.08/trunk/src/lmContainer.cpp irstlm-5.80.08.new/trunk/src/lmContainer.cpp --- irstlm-5.80.08/trunk/src/lmContainer.cpp 2015-02-12 14:16:34.000000001 +0000 +++ irstlm-5.80.08.new/trunk/src/lmContainer.cpp 2018-08-19 16:56:35.000000001 +0100 @@ -19,9 +19,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ******************************************************************************/ -#include <stdio.h> +#include <cstdio> #include <cstdlib> -#include <stdlib.h> #include <iostream> #include <stdexcept> #include <string> diff -rU3 irstlm-5.80.08/trunk/src/lmContainer.h irstlm-5.80.08.new/trunk/src/lmContainer.h --- irstlm-5.80.08/trunk/src/lmContainer.h 2015-02-12 14:16:34.000000001 +0000 +++ irstlm-5.80.08.new/trunk/src/lmContainer.h 2018-08-19 16:56:35.000000001 +0100 @@ -30,9 +30,8 @@ #define _IRSTLM_LMINTERPOLATION 4 -#include <stdio.h> +#include <cstdio> #include <cstdlib> -#include <stdlib.h> #include "util.h" #include "n_gram.h" #include "dictionary.h" diff -rU3 irstlm-5.80.08/trunk/src/lmInterpolation.cpp irstlm-5.80.08.new/trunk/src/lmInterpolation.cpp --- irstlm-5.80.08/trunk/src/lmInterpolation.cpp 2015-02-10 13:36:31.000000001 +0000 +++ irstlm-5.80.08.new/trunk/src/lmInterpolation.cpp 2018-08-19 16:56:35.000000001 +0100 @@ -19,9 +19,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ******************************************************************************/ -#include <stdio.h> +#include <cstdio> #include <cstdlib> -#include <stdlib.h> #include <iostream> #include <stdexcept> #include <string> diff -rU3 irstlm-5.80.08/trunk/src/lmInterpolation.h irstlm-5.80.08.new/trunk/src/lmInterpolation.h --- irstlm-5.80.08/trunk/src/lmInterpolation.h 2014-05-13 10:34:26.000000001 +0100 +++ irstlm-5.80.08.new/trunk/src/lmInterpolation.h 2018-08-19 16:56:35.000000001 +0100 @@ -23,11 +23,10 @@ #ifndef MF_LMINTERPOLATION_H #define MF_LMINTERPOLATION_H -#include <stdio.h> +#include <cstdio> #include <cstdlib> -#include <stdlib.h> #include <string> -#include <math.h> +#include <cmath> #include <vector> #include "util.h" #include "dictionary.h" diff -rU3 irstlm-5.80.08/trunk/src/lmmacro.cpp irstlm-5.80.08.new/trunk/src/lmmacro.cpp --- irstlm-5.80.08/trunk/src/lmmacro.cpp 2015-02-24 09:48:34.000000001 +0000 +++ irstlm-5.80.08.new/trunk/src/lmmacro.cpp 2018-08-19 16:56:35.000000001 +0100 @@ -19,8 +19,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ******************************************************************************/ -#include <stdio.h> -#include <stdlib.h> +#include <cstdio> +#include <cstdlib> #include <fcntl.h> #include <iostream> #include <fstream> diff -rU3 irstlm-5.80.08/trunk/src/lmtable.cpp irstlm-5.80.08.new/trunk/src/lmtable.cpp --- irstlm-5.80.08/trunk/src/lmtable.cpp 2015-02-18 16:50:45.000000001 +0000 +++ irstlm-5.80.08.new/trunk/src/lmtable.cpp 2018-08-19 16:56:35.000000001 +0100 @@ -20,9 +20,8 @@ ******************************************************************************/ -#include <stdio.h> +#include <cstdio> #include <cstdlib> -#include <stdlib.h> #include <fcntl.h> #include <iostream> #include <fstream> diff -rU3 irstlm-5.80.08/trunk/src/lmtable.h irstlm-5.80.08.new/trunk/src/lmtable.h --- irstlm-5.80.08/trunk/src/lmtable.h 2015-02-24 09:48:34.000000001 +0000 +++ irstlm-5.80.08.new/trunk/src/lmtable.h 2018-08-19 16:56:35.000000001 +0100 @@ -29,7 +29,7 @@ #include <sys/mman.h> #endif -#include <math.h> +#include <cmath> #include <cstdlib> #include <string> #include <set> diff -rU3 irstlm-5.80.08/trunk/src/Makefile.am irstlm-5.80.08.new/trunk/src/Makefile.am --- irstlm-5.80.08/trunk/src/Makefile.am 2014-12-03 08:56:12.000000001 +0000 +++ irstlm-5.80.08.new/trunk/src/Makefile.am 2018-08-19 16:56:35.000000001 +0100 @@ -1,6 +1,6 @@ lib_LTLIBRARIES = libirstlm.la -AM_CXXFLAGS = -isystem/usr/include -W -Wall -ffor-scope -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES $(BOOST_CPPFLAGS) -DMYCODESIZE=3 +AM_CXXFLAGS = -W -Wall -ffor-scope -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES $(BOOST_CPPFLAGS) -DMYCODESIZE=3 libirstlm_ladir = ${includedir} diff -rU3 irstlm-5.80.08/trunk/src/mempool.cpp irstlm-5.80.08.new/trunk/src/mempool.cpp --- irstlm-5.80.08/trunk/src/mempool.cpp 2015-02-10 13:36:31.000000001 +0000 +++ irstlm-5.80.08.new/trunk/src/mempool.cpp 2018-08-19 16:56:35.000000001 +0100 @@ -24,11 +24,9 @@ // by M. Federico // Copyright Marcello Federico, ITC-irst, 1998 -#include <stdio.h> +#include <cstdio> #include <cstring> -#include <string.h> #include <cstdlib> -#include <stdlib.h> #include <iostream> #include <ostream> #include "util.h" diff -rU3 irstlm-5.80.08/trunk/src/mfstream.h irstlm-5.80.08.new/trunk/src/mfstream.h --- irstlm-5.80.08/trunk/src/mfstream.h 2015-02-13 08:40:42.000000001 +0000 +++ irstlm-5.80.08.new/trunk/src/mfstream.h 2018-08-19 16:56:35.000000001 +0100 @@ -19,10 +19,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ******************************************************************************/ -#include <stdio.h> -#include <stdlib.h> +#include <cstdio> +#include <cstdlib> #include <unistd.h> -#include <string.h> +#include <cstring> #include <iostream> #include <cstring> #include <cstdlib> diff -rU3 irstlm-5.80.08/trunk/src/ngramcache.cpp irstlm-5.80.08.new/trunk/src/ngramcache.cpp --- irstlm-5.80.08/trunk/src/ngramcache.cpp 2015-02-18 16:50:08.000000001 +0000 +++ irstlm-5.80.08.new/trunk/src/ngramcache.cpp 2018-08-19 16:56:35.000000001 +0100 @@ -22,8 +22,8 @@ #include <iostream> #include <fstream> #include <stdexcept> -#include <stdio.h> -#include <stdlib.h> +#include <cstdio> +#include <cstdlib> #include <cstring> #include <sstream> #include <string> diff -rU3 irstlm-5.80.08/trunk/src/n_gram.cpp irstlm-5.80.08.new/trunk/src/n_gram.cpp --- irstlm-5.80.08/trunk/src/n_gram.cpp 2015-02-16 08:16:51.000000001 +0000 +++ irstlm-5.80.08.new/trunk/src/n_gram.cpp 2018-08-19 16:56:35.000000001 +0100 @@ -21,9 +21,8 @@ ******************************************************************************/ -#include <stdio.h> +#include <cstdio> #include <cstdlib> -#include <stdlib.h> #include <iomanip> #include <sstream> #include "util.h" diff -rU3 irstlm-5.80.08/trunk/src/prune-lm.cpp irstlm-5.80.08.new/trunk/src/prune-lm.cpp --- irstlm-5.80.08/trunk/src/prune-lm.cpp 2014-05-13 16:27:10.000000001 +0100 +++ irstlm-5.80.08.new/trunk/src/prune-lm.cpp 2018-08-19 16:56:35.000000001 +0100 @@ -26,7 +26,7 @@ #include <fstream> #include <vector> #include <string> -#include <stdlib.h> +#include <cstdlib> #include "cmd.h" #include "util.h" #include "math.h" diff -rU3 irstlm-5.80.08/trunk/src/quantize-lm.cpp irstlm-5.80.08.new/trunk/src/quantize-lm.cpp --- irstlm-5.80.08/trunk/src/quantize-lm.cpp 2015-02-13 08:40:42.000000001 +0000 +++ irstlm-5.80.08.new/trunk/src/quantize-lm.cpp 2018-08-19 16:56:35.000000001 +0100 @@ -26,7 +26,7 @@ #include <fstream> #include <vector> #include <string> -#include <stdlib.h> +#include <cstdlib> #include "cmd.h" #include "math.h" #include "util.h" diff -rU3 irstlm-5.80.08/trunk/src/shiftlm.cpp irstlm-5.80.08.new/trunk/src/shiftlm.cpp --- irstlm-5.80.08/trunk/src/shiftlm.cpp 2015-02-10 13:36:31.000000001 +0000 +++ irstlm-5.80.08.new/trunk/src/shiftlm.cpp 2018-08-19 16:56:35.000000001 +0100 @@ -18,10 +18,10 @@ ******************************************************************************/ -#include <string.h> -#include <stdio.h> -#include <stdlib.h> -#include <math.h> +#include <cstring> +#include <cstdio> +#include <cstdlib> +#include <cmath> #include <sstream> #include "util.h" #include "mfstream.h" diff -rU3 irstlm-5.80.08/trunk/src/stream-tlm.cpp irstlm-5.80.08.new/trunk/src/stream-tlm.cpp --- irstlm-5.80.08/trunk/src/stream-tlm.cpp 2015-01-22 13:51:11.000000001 +0000 +++ irstlm-5.80.08.new/trunk/src/stream-tlm.cpp 2018-08-19 16:56:35.000000001 +0100 @@ -21,10 +21,9 @@ using namespace std; #include <cmath> -#include <math.h> #include "mfstream.h" #include <fstream> -#include <stdio.h> +#include <cstdio> #include <iostream> #include "mempool.h" #include "htable.h" diff -rU3 irstlm-5.80.08/trunk/src/tlm.cpp irstlm-5.80.08.new/trunk/src/tlm.cpp --- irstlm-5.80.08/trunk/src/tlm.cpp 2015-01-22 13:51:11.000000001 +0000 +++ irstlm-5.80.08.new/trunk/src/tlm.cpp 2018-08-19 16:56:35.000000001 +0100 @@ -21,7 +21,6 @@ #include <iostream> #include <cmath> -#include <math.h> #include "cmd.h" #include "mfstream.h" #include "mempool.h" diff -rU3 irstlm-5.80.08/trunk/src/util.cpp irstlm-5.80.08.new/trunk/src/util.cpp --- irstlm-5.80.08/trunk/src/util.cpp 2015-02-13 08:42:42.000000001 +0000 +++ irstlm-5.80.08.new/trunk/src/util.cpp 2018-08-19 16:56:35.000000001 +0100 @@ -21,7 +21,7 @@ #ifdef WIN32 #include <windows.h> -#include <string.h> +#include <cstring> #include <io.h> #else #include <cstring> diff -rU3 irstlm-5.80.08/trunk/src/util.h irstlm-5.80.08.new/trunk/src/util.h --- irstlm-5.80.08/trunk/src/util.h 2015-02-13 08:42:42.000000001 +0000 +++ irstlm-5.80.08.new/trunk/src/util.h 2018-08-19 16:56:35.000000001 +0100 @@ -8,7 +8,7 @@ #include <string> #include <iostream> #include <fstream> -#include <assert.h> +#include <cassert> #define MAX(a,b) (((a)>(b))?(a):(b)) diff -rU3 irstlm-5.80.08/trunk/src/verify-caching.cpp irstlm-5.80.08.new/trunk/src/verify-caching.cpp --- irstlm-5.80.08/trunk/src/verify-caching.cpp 2014-05-15 07:32:02.000000001 +0100 +++ irstlm-5.80.08.new/trunk/src/verify-caching.cpp 2018-08-19 16:56:35.000000001 +0100 @@ -23,7 +23,7 @@ #include <iostream> #include <string> -#include <stdlib.h> +#include <cstdlib> #include "cmd.h" #include "util.h" #include "mdiadapt.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
