record new upstream branch
[serna.git] / debian / patches / 0009-libsp-adjustments-for-64-bits.patch
1 From 74920c1eddaaff937605e578f639d61577d50a6b Mon Sep 17 00:00:00 2001
2 From: Joachim Breitner <mail@joachim-breitner.de>
3 Date: Tue, 10 Nov 2009 15:58:04 +0100
4 Subject: libsp adjustments for 64 bits
5
6 ---
7  3rd/jade/libsp/parser_inst.cxx |   19 ++++++++-----------
8  3rd/jade/libsp/parser_inst.m4  |    2 +-
9  2 files changed, 9 insertions(+), 12 deletions(-)
10
11 diff --git a/3rd/jade/libsp/parser_inst.cxx b/3rd/jade/libsp/parser_inst.cxx
12 index 2fa1996..21a604f 100644
13 --- a/3rd/jade/libsp/parser_inst.cxx
14 +++ b/3rd/jade/libsp/parser_inst.cxx
15 @@ -13,9 +13,6 @@ namespace SP_NAMESPACE {
16  
17  #ifdef SP_MANUAL_INST
18  
19 -#include "Attribute.h"
20 -#include "Trie.h"
21 -
22  #define SP_DEFINE_TEMPLATES
23  #include "Owner.h"
24  #include "CopyOwner.h"
25 @@ -1328,28 +1325,28 @@ typedef Vector<LeafContentToken*> Dummy_95;
26  #endif
27  #endif
28  #ifdef __DECCXX
29 -#pragma define_template Vector<size_t>
30 +#pragma define_template Vector<unsigned int>
31  #else
32  #ifdef __xlC__
33 -#pragma define(Vector<size_t>)
34 +#pragma define(Vector<unsigned int>)
35  #else
36  #ifdef SP_ANSI_CLASS_INST
37 -template class Vector<size_t>;
38 +template class Vector<unsigned int>;
39  #else
40 -typedef Vector<size_t> Dummy_96;
41 +typedef Vector<unsigned int> Dummy_96;
42  #endif
43  #endif
44  #endif
45  #ifdef __DECCXX
46 -#pragma define_template Vector<unsigned int>
47 +#pragma define_template Vector<unsigned long int>
48  #else
49  #ifdef __xlC__
50 -#pragma define(Vector<unsigned int>)
51 +#pragma define(Vector<unsigned long int>)
52  #else
53  #ifdef SP_ANSI_CLASS_INST
54 -// XX template class Vector<unsigned int>;
55 +template class Vector<unsigned long int>;
56  #else
57 -typedef Vector<unsigned int> Dummy_97;
58 +typedef Vector<unsigned long int> Dummy_97;
59  #endif
60  #endif
61  #endif
62 diff --git a/3rd/jade/libsp/parser_inst.m4 b/3rd/jade/libsp/parser_inst.m4
63 index 9ade7b8..5535850 100644
64 --- a/3rd/jade/libsp/parser_inst.m4
65 +++ b/3rd/jade/libsp/parser_inst.m4
66 @@ -164,8 +164,8 @@ __instantiate(Vector<NamedResourceTable<Entity> >)
67  __instantiate(Vector<ContentModelAmbiguity>)
68  __instantiate(Vector<Transition>)
69  __instantiate(Vector<LeafContentToken*>)
70 -__instantiate(Vector<size_t>)
71  __instantiate(Vector<unsigned int>)
72 +__instantiate(Vector<unsigned long int>)
73  
74  __instantiate(NamedTable<Id>)
75  __instantiate(NamedTableIter<Id>)
76 -- 
77 1.6.6
78