Gentoo Linux -- List Archive: gentoo-commits

Note: Due to technical difficulties, the Archives are currently not up to date. GMANE provides an alternative service for most mailing lists.
c.f. bug 424647
List Archive: gentoo-commits
Navigation:
Lists: gentoo-commits: < Prev By Thread Next > < Prev By Date Next >
Headers:
To:	gentoo-commits@g.o
From:	"Sebastien Fabbro (bicatali)" <bicatali@g.o>
Subject:	gentoo-x86 commit in sci-mathematics/freemat/files: freemat-3.6-includes.patch
Date:	Tue, 20 May 2008 16:44:52 +0000
bicatali    08/05/20 16:44:52

  Added:                freemat-3.6-includes.patch
  Log:
  Fixed for gcc-4.3, some includes files and adpated for qt-4.4. Also set some use flags as default
  (Portage version: 2.1.5)

Revision  Changes    Path
1.1                  sci-mathematics/freemat/files/freemat-3.6-includes.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-mathematics/freemat/files/freemat-3.6-includes.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-mathematics/freemat/files/freemat-3.6-includes.patch?rev=1.1&content-type=text/plain

Index: freemat-3.6-includes.patch
===================================================================
--- ./libs/libCore/IO.cpp.orig	2008-03-14 15:43:03.000000000 +0000
+++ ./libs/libCore/IO.cpp	2008-05-20 17:18:35.000000000 +0100
@@ -19,8 +19,8 @@
  */
 
 #include "Array.hpp"
-#include <stdio.h>
-#include <errno.h>
+#include <cstdio>
+#include <cerrno>
 #include <math.h>
 #include "Malloc.hpp"
 #include "HandleList.hpp"
--- ./libs/libCore/Random.cpp.orig	2008-03-15 05:16:27.000000000 +0000
+++ ./libs/libCore/Random.cpp	2008-05-20 17:18:35.000000000 +0100
@@ -21,7 +21,7 @@
 #include "Exception.hpp"
 #include "Malloc.hpp"
 #include <math.h>
-#include <stdio.h>
+#include <cstdio>
 #include "RanLib.hpp"
 
 static bool initialized = false;
--- ./libs/libCore/Constructors.cpp.orig	2008-03-14 15:43:03.000000000 +0000
+++ ./libs/libCore/Constructors.cpp	2008-05-20 17:18:35.000000000 +0100
@@ -21,10 +21,10 @@
 #include "Math.hpp"
 #include "Exception.hpp"
 #include <math.h>
-#include <stdio.h>
+#include <cstdio>
 #include "Core.hpp"
 #include "Malloc.hpp"
-#include <ctype.h>
+#include <cctype>
 
 
 //!
--- ./libs/libCore/RanLib.cpp.orig	2008-03-14 15:43:03.000000000 +0000
+++ ./libs/libCore/RanLib.cpp	2008-05-20 17:18:35.000000000 +0100
@@ -18,11 +18,9 @@
  */
 
 #include "Exception.hpp"
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdio.h>
+#include <cstdlib>
+#include <cstdio>
 #include <math.h>
-#include <stdlib.h>
 #include "RanLib.hpp"
 
 /* 
@@ -68,7 +68,6 @@
    email: matumoto@...
 */
 
-#include <stdio.h>
 
 /* Period parameters */  
 #define N 624
--- ./libs/libCore/Directory.cpp.orig	2008-03-14 15:43:03.000000000 +0000
+++ ./libs/libCore/Directory.cpp	2008-05-20 17:18:35.000000000 +0100
@@ -20,7 +20,7 @@
 #include "Array.hpp"
 #include "Interpreter.hpp"
 #include "Utils.hpp"
-#include <stdio.h>
+#include <cstdio>
 #include "System.hpp"
 #include <QtCore>
 
--- ./libs/libFreeMat/Scope.hpp.orig	2008-05-20 15:26:51.000000000 +0100
+++ ./libs/libFreeMat/Scope.hpp	2008-05-20 15:27:26.000000000 +0100
@@ -24,6 +24,7 @@
  * A Scope is a combination of a variable hashtable and a function hashtable.
  */
 #include <string>
+#include <algorithm>
 #include <QMutex>
 
 #include "Array.hpp"
--- ./libs/libFreeMat/Malloc.cpp.orig	2008-05-20 15:28:34.000000000 +0100
+++ ./libs/libFreeMat/Malloc.cpp	2008-05-20 15:29:19.000000000 +0100
@@ -19,9 +19,9 @@
 
 #include "Malloc.hpp"
 #include "Exception.hpp"
-#include <stdlib.h>
-#include <stdio.h>
-
+#include <cstdlib>
+#include <cstdio>
+#include <cstring>
 
 void* Malloc(int count) {
   void* ptr;
--- ./libs/libFreeMat/Context.hpp.orig	2008-05-20 15:46:01.000000000 +0100
+++ ./libs/libFreeMat/Context.hpp	2008-05-20 15:47:46.000000000 +0100
@@ -30,7 +30,7 @@
 #include <QDebug>
 #include <QList>
 #include <QMutex>
-#include <stdarg.h>
+#include <cstdarg>
 
 /**
  * This class represents a reference to an array in a scope
--- ./libs/libFreeMat/Token.cpp.orig	2008-05-20 15:30:09.000000000 +0100
+++ ./libs/libFreeMat/Token.cpp	2008-05-20 15:31:57.000000000 +0100
@@ -1,7 +1,8 @@
 #include "Token.hpp"
 #include "Serialize.hpp"
 #include <iostream>
-#include <errno.h>
+#include <cerrno>
+#include <climits>
 
 // These must appear as sequential token numbers
 string fm_reserved[22] = {
--- ./libs/libFreeMat/File.hpp.orig	2008-05-20 15:46:12.000000000 +0100
+++ ./libs/libFreeMat/File.hpp	2008-05-20 15:47:35.000000000 +0100
@@ -19,7 +19,7 @@
 
 #ifndef __File_hpp__
 #define __File_hpp__
-#include <stdio.h>
+#include <cstdio>
 #include "Stream.hpp"
 #include <string>
 
--- ./libs/libFreeMat/Scanner.cpp.orig	2008-05-20 15:32:16.000000000 +0100
+++ ./libs/libFreeMat/Scanner.cpp	2008-05-20 15:32:56.000000000 +0100
@@ -1,8 +1,9 @@
 #include "Scanner.hpp"
 #include <iostream>
-#include <stdio.h>
-#include <stdlib.h>
-#include <ctype.h>
+#include <algorithm>
+#include <cstdio>
+#include <cstdlib>
+#include <cctype>
 #include "Exception.hpp"
 
 extern string fm_reserved[];
--- ./libs/libFreeMat/LAPACK.hpp.orig	2008-05-20 15:46:19.000000000 +0100
+++ ./libs/libFreeMat/LAPACK.hpp	2008-05-20 15:47:16.000000000 +0100
@@ -20,7 +20,7 @@
 #ifndef __FMLAPACK_hpp__
 #define __FMLAPACK_hpp__
 
-#include <string.h>
+#include <cstring>
 
 // Lapack routines used are declared here
 extern "C" {
--- ./libs/libFreeMat/Print.hpp.orig	2008-05-20 15:46:29.000000000 +0100
+++ ./libs/libFreeMat/Print.hpp	2008-05-20 15:46:53.000000000 +0100
@@ -23,8 +23,8 @@
 #include <vector>
 #include <list>
 #include <string>
-#include <stdlib.h>
-#include <stdio.h>
+#include <cstdlib>
+#include <cstdio>
 #include "Array.hpp"
 
 class Interpreter;
--- ./libs/libFreeMat/Sparse.cpp.orig	2008-05-20 15:34:58.000000000 +0100
+++ ./libs/libFreeMat/Sparse.cpp	2008-05-20 15:33:55.000000000 +0100
@@ -29,7 +29,7 @@
 #include "LAPACK.hpp"
 #include "MemPtr.hpp"
 #include "Math.hpp"
-#include <math.h>
+#include <cmath>
 
 // Routines that need to be Colon-compliant
 // SetSparseNDimSubsets
--- ./libs/libFreeMat/Serialize.cpp.orig	2008-05-20 15:36:42.000000000 +0100
+++ ./libs/libFreeMat/Serialize.cpp	2008-05-20 15:36:02.000000000 +0100
@@ -20,7 +20,7 @@
 #include "Serialize.hpp"
 #include "Exception.hpp"
 #include "Malloc.hpp"
-#include <stdio.h>
+#include <cstdio>
 
 #ifdef WIN32
 #include <winsock2.h>
--- ./libs/libFreeMat/SingularValueDecompose.cpp.orig	2008-05-20 15:35:16.000000000 +0100
+++ ./libs/libFreeMat/SingularValueDecompose.cpp	2008-05-20 15:35:31.000000000 +0100
@@ -19,8 +19,8 @@
 
 #include "SingularValueDecompose.hpp"
 #include "LAPACK.hpp"
-#include <stdlib.h>
-#include <stdio.h>
+#include <cstdlib>
+#include <cstdio>
 #include "Malloc.hpp"
 
 #define min(a,b) ((a) < (b) ? (a) : (b))
--- ./libs/libFreeMat/Array.cpp.orig	2008-05-20 15:37:11.000000000 +0100
+++ ./libs/libFreeMat/Array.cpp	2008-05-20 15:37:48.000000000 +0100
@@ -24,8 +24,8 @@
 #include "IEEEFP.hpp"
 #include "Interpreter.hpp"
 #include "Sparse.hpp"
-#include <math.h>
-#include <stdio.h>
+#include <cmath>
+#include <cstdio>
 #include <set>
 
 #include "FunctionDef.hpp"
--- ./libs/libFreeMat/Dimensions.cpp.orig	2008-05-20 15:37:29.000000000 +0100
+++ ./libs/libFreeMat/Dimensions.cpp	2008-05-20 15:38:08.000000000 +0100
@@ -19,9 +19,9 @@
 
 #include "Dimensions.hpp"
 #include "Exception.hpp"
-#include <stdlib.h>
+#include <cstdlib>
 #include <string>
-#include <stdio.h>
+#include <cstdio>
 #include "Malloc.hpp"
 #include "Interpreter.hpp"
 
--- ./libs/libFreeMat/EigenDecompose.cpp.orig	2008-05-20 15:38:34.000000000 +0100
+++ ./libs/libFreeMat/EigenDecompose.cpp	2008-05-20 15:39:44.000000000 +0100
@@ -19,8 +19,8 @@
 
 #include "EigenDecompose.hpp"
 #include "LAPACK.hpp"
-#include <stdlib.h>
-#include <stdio.h>
+#include <cstdlib>
+#include <cstdio>
 #include "Malloc.hpp"
 
 #define MAX(a,b) ((a) > (b) ? (a) : (b))
--- ./libs/libFreeMat/Interpreter.cpp.orig	2008-05-20 15:38:41.000000000 +0100
+++ ./libs/libFreeMat/Interpreter.cpp	2008-05-20 15:39:18.000000000 +0100
@@ -18,8 +18,8 @@
  */
 
 #include "Interpreter.hpp"
-#include <math.h>
-#include <stdio.h>
+#include <cmath>
+#include <cstdio>
 #include "Exception.hpp"
 #include "Math.hpp"
 #include "Array.hpp"
@@ -30,7 +30,7 @@
 #include "Module.hpp"
 #include "File.hpp"
 #include "Serialize.hpp"
-#include <signal.h>
+#include <csignal>
 #include "Class.hpp"
 #include "Print.hpp"
 #include "MemPtr.hpp"
@@ -38,7 +38,7 @@
 #include <qeventloop.h>
 #include <QtCore>
 #include <fstream>
-#include <stdarg.h>
+#include <cstdarg>
 #include "JIT.hpp"
 #include "JITFunc.hpp"
 
--- ./libs/libFreeMat/Exception.cpp.orig	2008-05-20 15:40:54.000000000 +0100
+++ ./libs/libFreeMat/Exception.cpp	2008-05-20 15:42:02.000000000 +0100
@@ -17,9 +17,9 @@
  *
  */
 
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
+#include <cstring>
+#include <cstdlib>
+#include <cstdio>
 #include <iostream>
 #include "Exception.hpp"
 #include "Malloc.hpp"
--- ./libs/libFreeMat/FunctionDef.cpp.orig	2008-05-20 15:41:04.000000000 +0100
+++ ./libs/libFreeMat/FunctionDef.cpp	2008-05-20 15:41:23.000000000 +0100
@@ -22,7 +22,7 @@
 #include "Parser.hpp"
 #include "Exception.hpp"
 #include <iostream>
-#include <signal.h>
+#include <csignal>
 #include "SymbolTable.hpp"
 #include "Types.hpp"
 #include "MexInterface.hpp"
--- ./libs/libFreeMat/Math.cpp.orig	2008-05-20 15:42:37.000000000 +0100
+++ ./libs/libFreeMat/Math.cpp	2008-05-20 15:44:27.000000000 +0100
@@ -26,7 +26,7 @@
 #include "EigenDecompose.hpp"
 #include "Malloc.hpp"
 #include "Sparse.hpp"
-#include <math.h>
+#include <cmath>
 
 // Sparse ops: +, -, neg, *
 
--- ./libs/libFreeMat/LeastSquaresSolver.cpp.orig	2008-05-20 15:42:17.000000000 +0100
+++ ./libs/libFreeMat/LeastSquaresSolver.cpp	2008-05-20 15:44:51.000000000 +0100
@@ -19,8 +19,8 @@
 
 #include "LeastSquaresSolver.hpp"
 #include "LAPACK.hpp"
-#include <stdlib.h>
-#include <stdio.h>
+#include <cstdlib>
+#include <cstdio>
 #include "Malloc.hpp"
 
 #define MSGBUFLEN 2048
--- ./libs/libFreeMat/LinearEqSolver.cpp.orig	2008-05-20 15:42:26.000000000 +0100
+++ ./libs/libFreeMat/LinearEqSolver.cpp	2008-05-20 15:44:41.000000000 +0100
@@ -19,8 +19,8 @@
 
 #include "LinearEqSolver.hpp"
 #include "LAPACK.hpp"
-#include <stdlib.h>
-#include <stdio.h>
+#include <cstdlib>
+#include <cstdio>
 #include <iostream>
 #include "Malloc.hpp"
 
--- ./libs/libFreeMat/MatrixMultiply.cpp.orig	2008-05-20 15:42:45.000000000 +0100
+++ ./libs/libFreeMat/MatrixMultiply.cpp	2008-05-20 15:44:16.000000000 +0100
@@ -18,9 +18,9 @@
  */
 
 #include "MatrixMultiply.hpp"
-#include <math.h>
-#include <stdlib.h>
-#include <stdio.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstdio>
 
 extern "C" {
   void sgemm_ (char * ta, char* tb, int* m, int* n, int* k, float *alp,
--- ./libs/libFreeMat/Print.cpp.orig	2008-05-20 15:42:54.000000000 +0100
+++ ./libs/libFreeMat/Print.cpp	2008-05-20 15:43:58.000000000 +0100
@@ -2,8 +2,8 @@
 #include "IEEEFP.hpp"
 #include "FunctionDef.hpp"
 #include "Interpreter.hpp"
-#include <math.h>
-#include <string.h>
+#include <cmath>
+#include <cstring>
 
 #define MSGBUFLEN 2048
 
--- ./libs/libFreeMat/QRDecompose.cpp.orig	2008-05-20 15:43:12.000000000 +0100
+++ ./libs/libFreeMat/QRDecompose.cpp	2008-05-20 15:43:45.000000000 +0100
@@ -19,8 +19,8 @@
 
 #include "QRDecompose.hpp"
 #include "LAPACK.hpp"
-#include <stdlib.h>
-#include <stdio.h>
+#include <cstdlib>
+#include <cstdio>
 #include "Malloc.hpp"
 
 #define MIN(a,b) (((a) < (b)) ? (a) : (b))
--- ./libs/libXP/System.cpp.orig	2008-03-14 15:43:11.000000000 +0000
+++ ./libs/libXP/System.cpp	2008-05-20 17:18:36.000000000 +0100
@@ -18,7 +18,7 @@
  */
 #include "System.hpp"
 #include "Exception.hpp"
-#include <stdlib.h>
+#include <cstdlib>
 #include <QProcess>
 #include <QtGui>
 #ifdef Q_OS_WIN32
--- ./libs/libMex/mxArray.cpp.orig	2008-03-14 15:43:03.000000000 +0000
+++ ./libs/libMex/mxArray.cpp	2008-05-20 17:18:36.000000000 +0100
@@ -17,8 +17,8 @@
  *
  */
 #include "mex.h"
-#include <string.h>
-#include <stdlib.h>
+#include <cstring>
+#include <cstdlib>
 #include <set>
 #include <string>
 
--- ./libs/libGraphics/HandleCommands.cpp.orig	2008-03-14 15:43:05.000000000 +0000
+++ ./libs/libGraphics/HandleCommands.cpp	2008-05-20 17:18:36.000000000 +0100
@@ -27,7 +27,7 @@
 #include <qgl.h>
 #include <QtGui>
 #include <QtSvg>
-#include <ctype.h>
+#include <cctype>
 #include <algorithm>
 #include "HandleLineSeries.hpp"
 #include "HandleObject.hpp"
--- ./src/main.cpp.orig	2008-03-14 15:42:59.000000000 +0000
+++ ./src/main.cpp	2008-05-20 17:18:36.000000000 +0100
@@ -20,9 +20,9 @@
 #include <QtGui>
 #include <QDebug>
 #include <unistd.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <csignal>
+#include <cstdio>
+#include <cstdlib>
 #include "MainApp.hpp"
 #include <qapplication.h>
 #include "Exception.hpp"
--- ./src/MainApp.cpp.orig	2008-03-16 20:00:20.000000000 +0000
+++ ./src/MainApp.cpp	2008-05-20 17:18:36.000000000 +0100
@@ -46,7 +46,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <qsocketnotifier.h>
-#include <signal.h>
+#include <csignal>
 #include <unistd.h>
 
 sig_t signal_suspend_default;
--- ./src/DumbTerminal.cpp.orig	2008-03-14 15:42:59.000000000 +0000
+++ ./src/DumbTerminal.cpp	2008-05-20 17:18:36.000000000 +0100
@@ -20,7 +20,7 @@
 #include "DumbTerminal.hpp"
 #include <qapplication.h>
 #include <qeventloop.h>
-#include <stdio.h>
+#include <cstdio>
 #include <unistd.h>
 
 DumbTerminal::DumbTerminal() {
--- ./src/Terminal.cpp.orig	2008-03-14 15:42:59.000000000 +0000
+++ ./src/Terminal.cpp	2008-05-20 17:18:36.000000000 +0100
@@ -19,11 +19,11 @@
 #include <qapplication.h>
 #include "Serialize.hpp"
 #include "Terminal.hpp"
-#include <errno.h>
+#include <cerrno>
 #include <unistd.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #ifdef Q_WS_X11
 #include <term.h>
 #include <curses.h>



-- 
gentoo-commits@g.o mailing list
Navigation:
Lists: gentoo-commits: < Prev By Thread Next > < Prev By Date Next >
Previous by thread:
gentoo-x86 commit in sci-mathematics/freemat: freemat-3.6.ebuild ChangeLog freemat-3.5.ebuild
Next by thread:
gentoo-x86 commit in sci-mathematics/freemat/files: freemat-3.6-includes.patch
Previous by date:
gentoo-x86 commit in sci-mathematics/freemat: freemat-3.6.ebuild ChangeLog freemat-3.5.ebuild
Next by date:
gentoo-x86 commit in app-misc/gramps/files: gramps-2.2.2-desktop-entry-icon.patch
Updated Jul 11, 2011
Summary: Archive of the gentoo-commits mailing list.
Donate to support our development efforts.