OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 16-Sep-2007 09:39:04
Branch: HEAD Handle: 2007091608390300
Modified files:
openpkg-src/jikes jikes.patch jikes.spec
Log:
add a bunch of fixes from sf.net
Summary:
Revision Changes Path
1.2 +71 -5 openpkg-src/jikes/jikes.patch
1.23 +1 -1 openpkg-src/jikes/jikes.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/jikes/jikes.patch
============================================================================
$ cvs diff -u -r1.1 -r1.2 jikes.patch
--- openpkg-src/jikes/jikes.patch 2 Jul 2003 14:01:49 -0000 1.1
+++ openpkg-src/jikes/jikes.patch 16 Sep 2007 07:39:03 -0000 1.2
@@ -1,7 +1,8 @@
---- src/platform.h.dist 2003-07-02 15:59:23.000000000 +0200
-+++ src/platform.h 2003-07-02 15:59:50.000000000 +0200
-@@ -141,6 +141,18 @@
- # include <time.h>
+Index: src/platform.h
+--- src/platform.h.orig 2004-08-20 02:21:17 +0200
++++ src/platform.h 2007-09-16 09:36:26 +0200
+@@ -151,6 +151,18 @@
+ # include STD_LIB_NAME(time)
#endif
+//
@@ -19,7 +20,7 @@
// C++ standard support
#ifdef HAVE_STD
-@@ -183,18 +195,6 @@
+@@ -182,18 +194,6 @@
#endif
@@ -38,3 +39,68 @@
typedef uint8_t u1;
typedef int8_t i1;
typedef uint16_t u2;
+Index: src/set.cpp
+--- src/set.cpp.orig 2002-12-11 01:55:04 +0100
++++ src/set.cpp 2007-09-16 09:36:26 +0200
+@@ -43,6 +43,9 @@
+
+ bool SymbolSet::operator==(const SymbolSet& rhs) const
+ {
++ if (!&rhs)
++ return false;
++
+ if (this != &rhs)
+ {
+ if (symbol_pool.Length() != rhs.symbol_pool.Length())
+@@ -70,6 +73,9 @@
+ //
+ void SymbolSet::Union(const SymbolSet& set)
+ {
++ if (!&set)
++ return;
++
+ if (this != &set)
+ {
+ for (unsigned i = 0; i < set.symbol_pool.Length(); i++)
+@@ -90,6 +96,9 @@
+ //
+ void SymbolSet::Intersection(const SymbolSet& set)
+ {
++ if (!&set)
++ return;
++
+ if (this != &set)
+ {
+ Tuple<Symbol*> old_symbol_pool(symbol_pool.Length());
+@@ -120,6 +129,9 @@
+ //
+ bool SymbolSet::Intersects(const SymbolSet& set) const
+ {
++ if (!&set)
++ return false;
++
+ for (unsigned i = 0; i < set.symbol_pool.Length(); i++)
+ {
+ ShadowSymbol* shadow = set.symbol_pool[i];
+@@ -139,6 +151,9 @@
+ //
+ void SymbolSet::RemoveElement(const Symbol* element)
+ {
++ if (!element)
++ return;
++
+ const NameSymbol* name_symbol = element -> Identity();
+ unsigned i = name_symbol -> index % hash_size;
+ ShadowSymbol* previous = NULL;
+Index: src/symbol.h
+--- src/symbol.h.orig 2004-09-27 01:10:19 +0200
++++ src/symbol.h 2007-09-16 09:36:26 +0200
+@@ -1106,8 +1106,6 @@
+ //
+ bool IsInner() const
+ {
+- assert((! IsLocal() && ! Anonymous()) ||
+- (IsNested() && ! ACC_STATIC()));
+ return IsNested() && ! ACC_STATIC();
+ }
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/jikes/jikes.spec
============================================================================
$ cvs diff -u -r1.22 -r1.23 jikes.spec
--- openpkg-src/jikes/jikes.spec 1 Jan 2007 17:38:49 -0000 1.22
+++ openpkg-src/jikes/jikes.spec 16 Sep 2007 07:39:03 -0000 1.23
@@ -33,7 +33,7 @@
Group: Language
License: IBMPL
Version: 1.22
-Release: 20061013
+Release: 20070916
# list of sources
Source0: http://switch.dl.sourceforge.net/jikes/jikes-%{version}.tar.bz2
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
