comparison: xbase/xbase.patch
xbase/xbase.patch
- changeset 97
- da688f850c6d
- child 98
- b48a2cd3a7b1
equal
deleted
inserted
replaced
| -1:000000000000 | 0:6d2fc738f661 |
|---|---|
| 1 Index: xbase-2.0.0/tv/tvbrowse.cpp | |
| 2 --- xbase-2.0.0/tv/tvbrowse.cpp.orig 2000-09-20 22:34:02 +0200 | |
| 3 +++ xbase-2.0.0/tv/tvbrowse.cpp 2006-01-15 00:23:04 +0100 | |
| 4 @@ -28,8 +28,8 @@ | |
| 5 #include <stdlib.h> | |
| 6 #include <stdio.h> | |
| 7 #include <string.h> | |
| 8 -#include <iomanip.h> | |
| 9 -#include <strstream.h> | |
| 10 +#include <sstream> | |
| 11 +#include <iomanip> | |
| 12 | |
| 13 #define Uses_TEvent | |
| 14 #include <tvision/tv.h> | |
| 15 Index: xbase-2.0.0/tv/tvxbase.cpp | |
| 16 --- xbase-2.0.0/tv/tvxbase.cpp.orig 2000-09-20 22:34:02 +0200 | |
| 17 +++ xbase-2.0.0/tv/tvxbase.cpp 2006-01-15 00:23:04 +0100 | |
| 18 @@ -23,7 +23,7 @@ | |
| 19 Foundation, Inc., or see http://www.gnu.org/. | |
| 20 */ | |
| 21 | |
| 22 -#include <iostream.h> | |
| 23 +#include <iostream> | |
| 24 | |
| 25 #define Uses_TApplication | |
| 26 #define Uses_TButton | |
| 27 Index: xbase-2.0.0/xbase/dbf.h | |
| 28 --- xbase-2.0.0/xbase/dbf.h.orig 2001-01-13 21:20:53 +0100 | |
| 29 +++ xbase-2.0.0/xbase/dbf.h 2006-01-15 00:23:04 +0100 | |
| 30 @@ -65,7 +65,7 @@ | |
| 31 #include <xbase/xtypes.h> | |
| 32 #include <xbase/xdate.h> | |
| 33 | |
| 34 -#include <iostream.h> | |
| 35 +#include <iostream> | |
| 36 #include <stdio.h> | |
| 37 | |
| 38 /*! \file dbf.h | |
| 39 Index: xbase-2.0.0/xbase/ndx.cpp | |
| 40 --- xbase-2.0.0/xbase/ndx.cpp.orig 2001-03-21 01:28:53 +0100 | |
| 41 +++ xbase-2.0.0/xbase/ndx.cpp 2006-01-15 00:23:04 +0100 | |
| 42 @@ -66,7 +66,8 @@ | |
| 43 #endif | |
| 44 | |
| 45 #include <xbase/xbase.h> | |
| 46 -#include <iostream.h> | |
| 47 +#include <iostream> | |
| 48 +using std::cout; | |
| 49 | |
| 50 #ifdef XB_INDEX_NDX | |
| 51 | |
| 52 Index: xbase-2.0.0/xbase/stack.cpp | |
| 53 --- xbase-2.0.0/xbase/stack.cpp.orig 2000-11-10 20:04:17 +0100 | |
| 54 +++ xbase-2.0.0/xbase/stack.cpp 2006-01-15 00:23:04 +0100 | |
| 55 @@ -59,7 +59,8 @@ | |
| 56 | |
| 57 #include <string.h> | |
| 58 #include <stdlib.h> | |
| 59 -#include <iostream.h> | |
| 60 +#include <iostream> | |
| 61 +using std::cout; | |
| 62 | |
| 63 #include <xbase/xstack.h> | |
| 64 | |
| 65 Index: xbase-2.0.0/xbase/xbstring.cpp | |
| 66 --- xbase-2.0.0/xbase/xbstring.cpp.orig 2001-02-20 18:53:26 +0100 | |
| 67 +++ xbase-2.0.0/xbase/xbstring.cpp 2006-01-15 00:23:04 +0100 | |
| 68 @@ -582,7 +582,7 @@ | |
| 69 //! Short description. | |
| 70 /*! | |
| 71 */ | |
| 72 -XBDLLEXPORT ostream& operator << ( ostream& os, const xbString& xbs ) { | |
| 73 +XBDLLEXPORT std::ostream& operator << ( std::ostream& os, const xbString& xbs ) { | |
| 74 return os << xbs.data; | |
| 75 } | |
| 76 | |
| 77 Index: xbase-2.0.0/xbase/xbstring.h | |
| 78 --- xbase-2.0.0/xbase/xbstring.h.orig 2001-01-27 06:00:32 +0100 | |
| 79 +++ xbase-2.0.0/xbase/xbstring.h 2006-01-15 00:23:04 +0100 | |
| 80 @@ -56,7 +56,11 @@ | |
| 81 #endif | |
| 82 | |
| 83 #include <stdlib.h> | |
| 84 -#include <iostream.h> | |
| 85 +#include <iostream> | |
| 86 + | |
| 87 +using std::endl; | |
| 88 +using std::cin; | |
| 89 +using std::cout; | |
| 90 | |
| 91 /*! \file xbstring.h | |
| 92 */ | |
| 93 @@ -119,7 +123,7 @@ | |
| 94 bool operator <= ( const xbString& ) const; | |
| 95 bool operator >= ( const xbString& ) const; | |
| 96 | |
| 97 - friend ostream& operator << ( ostream&, const xbString& ); | |
| 98 + friend std::ostream& operator << ( std::ostream&, const xbString& ); | |
| 99 | |
| 100 xbString &remove(size_t pos = 0, int n = npos); | |
| 101 xbString mid(size_t pos = 0, int n = npos) const; | |
| 102 Index: xbsql-0.11/xbsql/Makefile.in | |
| 103 --- xbsql-0.11/xbsql/Makefile.in.orig 2003-03-28 21:03:25 +0100 | |
| 104 +++ xbsql-0.11/xbsql/Makefile.in 2006-01-15 10:01:51 +0100 | |
| 105 @@ -108,10 +108,10 @@ | |
| 106 xbsql.tab.c xb_datetime.cpp | |
| 107 | |
| 108 | |
| 109 -libxbsql_la_LDFLAGS = -lxbase $(DEBUG) | |
| 110 +libxbsql_la_LDFLAGS = @LDFLAGS@ -lxbase $(DEBUG) | |
| 111 | |
| 112 xql_SOURCES = xql.cpp | |
| 113 -xql_LDADD = -lxbase -lreadline -l$(CURSES) ./libxbsql.la | |
| 114 +xql_LDADD = @LDFLAGS@ -lxbase -lreadline -l$(CURSES) ./libxbsql.la | |
| 115 | |
| 116 | |
| 117 #install-data-hook: | |
| 118 Index: xbase-2.0.0/ltmain.sh | |
| 119 --- xbase-2.0.0/ltmain.sh.orig 2000-06-01 08:03:18 +0200 | |
| 120 +++ xbase-2.0.0/ltmain.sh 2006-01-15 10:05:44 +0100 | |
| 121 @@ -728,7 +728,7 @@ | |
| 122 ;; | |
| 123 esac | |
| 124 deplibs="$deplibs $arg" | |
| 125 - lib_search_path="$lib_search_path `expr $arg : '-L\(.*\)'`" | |
| 126 + lib_search_path="$lib_search_path `expr x$arg : 'x-L\(.*\)'`" | |
| 127 ;; | |
| 128 | |
| 129 -l*) deplibs="$deplibs $arg" ;; |
