1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
|
--- ./inventor/lib/database/include/Inventor/SoPath.h.old 2005-09-15 22:19:05.000000000 +0000
+++ ./inventor/lib/database/include/Inventor/SoPath.h 2005-09-15 22:19:08.000000000 +0000
@@ -61,6 +61,8 @@
#include <Inventor/nodes/SoNode.h>
#include <Inventor/SoLists.h>
+class SoTempPath;
+
//////////////////////////////////////////////////////////////////////////////
//
// Class: SoPath
diff -urN ./inventor-old/lib/database/src/so/SoOutput.c++ ./inventor/lib/database/src/so/SoOutput.c++
--- ./inventor-old/lib/database/src/so/SoOutput.c++ 2001-09-25 00:45:35.000000000 +0000
+++ ./inventor/lib/database/src/so/SoOutput.c++ 2005-09-15 22:57:00.000000000 +0000
@@ -1462,11 +1462,7 @@
// Generates a CC warning. Ho hum.
if (refDict->find((unsigned long) base, ref))
-#if (_MIPS_SZPTR == 64 || __ia64)
referenceId = (int) ((unsigned long) ref);
-#else
- referenceId = (int)ref;
-#endif
return referenceId;
}
diff -urN ./inventor-old/lib/database/src/so/SoType.c++ ./inventor/lib/database/src/so/SoType.c++
--- ./inventor-old/lib/database/src/so/SoType.c++ 2003-07-11 22:40:53.000000000 +0000
+++ ./inventor/lib/database/src/so/SoType.c++ 2005-09-15 22:57:06.000000000 +0000
@@ -331,11 +331,7 @@
if (b == NULL)
return SoType::badType();
-#if (_MIPS_SZPTR == 64 || __ia64)
SoType result = typeData[(int) ((unsigned long) b)].type;
-#else
- SoType result = typeData[(int)b].type;
-#endif
if (result.storage.isPublic == 0) {
#ifdef DEBUG
diff -urN ./inventor-old/lib/interaction/src/draggers/SoDragger.c++ ./inventor/lib/interaction/src/draggers/SoDragger.c++
--- ./inventor-old/lib/interaction/src/draggers/SoDragger.c++ 2001-09-25 00:45:44.000000000 +0000
+++ ./inventor/lib/interaction/src/draggers/SoDragger.c++ 2005-09-15 22:58:56.000000000 +0000
@@ -686,11 +686,7 @@
int indexInPath = tempPathToThis->getIndex(numFmHead+1);
int numKidsNow = children->getLength();
-#if (_MIPS_SZPTR == 64 || __ia64)
int numKidsBefore = (int) ((long) (*tempPathNumKidsHack)[numFmHead]);
-#else
- int numKidsBefore = (int) (*tempPathNumKidsHack)[numFmHead];
-#endif
// To be correct, the childNode has to be the correct numbered
// child under the parent, and the parent should still
diff -urN ./inventor-old/lib/nodekits/src/nodekits/SoNkCatalog.c++ ./inventor/lib/nodekits/src/nodekits/SoNkCatalog.c++
--- ./inventor-old/lib/nodekits/src/nodekits/SoNkCatalog.c++ 2001-09-25 00:45:46.000000000 +0000
+++ ./inventor/lib/nodekits/src/nodekits/SoNkCatalog.c++ 2005-09-15 22:59:09.000000000 +0000
@@ -336,11 +336,7 @@
void *castPNum;
if ( partNameDict.find( (unsigned long) theName.getString(), castPNum ) )
-#if (_MIPS_SZPTR == 64 || __ia64)
return ( (int) ((long) castPNum) ); // System long
-#else
- return ( (int) castPNum );
-#endif
else
return SO_CATALOG_NAME_NOT_FOUND;
}
diff -urN ./inventor-old/lib/nodekits/src/upgraders/SoV1NkCatalog.c++ ./inventor/lib/nodekits/src/upgraders/SoV1NkCatalog.c++
--- ./inventor-old/lib/nodekits/src/upgraders/SoV1NkCatalog.c++ 2001-09-25 00:45:47.000000000 +0000
+++ ./inventor/lib/nodekits/src/upgraders/SoV1NkCatalog.c++ 2005-09-15 22:59:03.000000000 +0000
@@ -330,11 +330,7 @@
void *castPNum;
if ( partNameDict.find( (unsigned long) theName.getString(), castPNum ) )
-#if (_MIPS_SZPTR == 64 || __ia64)
return ( (int) ((long) castPNum) ); // System long
-#else
- return ( (int) castPNum );
-#endif
else
return SO_V1_CATALOG_NAME_NOT_FOUND;
}
diff -urN ./inventor-old/libSoXt/src/SoXtRsrc.c++ ./inventor/libSoXt/src/SoXtRsrc.c++
--- ./inventor-old/libSoXt/src/SoXtRsrc.c++ 2001-09-25 00:45:48.000000000 +0000
+++ ./inventor/libSoXt/src/SoXtRsrc.c++ 2005-09-15 22:59:19.000000000 +0000
@@ -145,13 +145,8 @@
classList = new XrmQuark[listSize];
for (q = 0, s = len - 1;
s >= 0; q++, s--) {
-#if (_MIPS_SZPTR == 64 || __ia64)
nameList[q] = (XrmQuark) ((long) nameplist[s]);
classList[q] = (XrmQuark) ((long) classplist[s]);
-#else
- nameList[q] = (XrmQuark) nameplist[s];
- classList[q] = (XrmQuark) classplist[s];
-#endif
}
// make the last entry the NULL sentinel
|
GitWeb