author | Niveditha Rau <Niveditha.Rau@Oracle.COM> |
Tue, 13 Oct 2015 20:41:07 -0700 | |
changeset 4946 | 0ef00d8ed5cc |
permissions | -rw-r--r-- |
4946
0ef00d8ed5cc
21803286 Move openjade from desktop to userland
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
1 |
# Existing set of patches from the desktop gate for building with Studio |
0ef00d8ed5cc
21803286 Move openjade from desktop to userland
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
2 |
# Since this is for our build, probably not something we can get upstream. |
0ef00d8ed5cc
21803286 Move openjade from desktop to userland
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
3 |
|
0ef00d8ed5cc
21803286 Move openjade from desktop to userland
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
4 |
--- openjade-1.3.2.orig/config/configure.in Mon Jan 5 18:00:49 2004 |
0ef00d8ed5cc
21803286 Move openjade from desktop to userland
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
5 |
+++ openjade-1.3.2/config/configure.in Mon Jan 5 18:03:02 2004 |
0ef00d8ed5cc
21803286 Move openjade from desktop to userland
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
6 |
@@ -130,6 +130,9 @@ |
0ef00d8ed5cc
21803286 Move openjade from desktop to userland
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
7 |
[define this to compile explicit template instantiations]) |
0ef00d8ed5cc
21803286 Move openjade from desktop to userland
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
8 |
CXXFLAGS="$CXXFLAGS -fno-implicit-templates" |
0ef00d8ed5cc
21803286 Move openjade from desktop to userland
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
9 |
fi |
0ef00d8ed5cc
21803286 Move openjade from desktop to userland
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
10 |
+ else |
0ef00d8ed5cc
21803286 Move openjade from desktop to userland
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
11 |
+ AC_DEFINE(SP_DEFINE_TEMPLATES,1, |
0ef00d8ed5cc
21803286 Move openjade from desktop to userland
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
12 |
+ [define this to include template definitions in the headers]) |
0ef00d8ed5cc
21803286 Move openjade from desktop to userland
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
13 |
fi |
0ef00d8ed5cc
21803286 Move openjade from desktop to userland
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
14 |
;; |
0ef00d8ed5cc
21803286 Move openjade from desktop to userland
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
15 |
esac |
0ef00d8ed5cc
21803286 Move openjade from desktop to userland
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
16 |
--- openjade-1.3.2/style/primitive.cxx.orig Tue Jan 6 05:45:14 2004 |
0ef00d8ed5cc
21803286 Move openjade from desktop to userland
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
17 |
+++ openjade-1.3.2/style/primitive.cxx Tue Jan 6 05:45:39 2004 |
0ef00d8ed5cc
21803286 Move openjade from desktop to userland
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
18 |
@@ -5047,7 +5047,7 @@ |
0ef00d8ed5cc
21803286 Move openjade from desktop to userland
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
19 |
if (!argv[1]->exactIntegerValue(n2)) |
0ef00d8ed5cc
21803286 Move openjade from desktop to userland
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
20 |
return argError(interp, loc, |
0ef00d8ed5cc
21803286 Move openjade from desktop to userland
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
21 |
InterpreterMessages::notAnExactInteger, 1, argv[1]); |
0ef00d8ed5cc
21803286 Move openjade from desktop to userland
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
22 |
- return new (interp) QuantityObj(pow(d1,n2), dim1*n2); |
0ef00d8ed5cc
21803286 Move openjade from desktop to userland
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
23 |
+ return new (interp) QuantityObj(pow(d1,(int)n2), dim1*n2); |
0ef00d8ed5cc
21803286 Move openjade from desktop to userland
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
24 |
} |
0ef00d8ed5cc
21803286 Move openjade from desktop to userland
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
25 |
else { |
0ef00d8ed5cc
21803286 Move openjade from desktop to userland
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
26 |
if ((q2 == ELObj::noQuantity) || (dim2 != 0)) |