Mercurial Mercurial > upstream > oracle > spec-files / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patches/openjade-02-forte.diff
author yippi
Mon, 27 Sep 2010 21:07:51 +0000
changeset 20108 51df67ca9307
parent 9397 b16e349d18c5
permissions -rw-r--r--
I had these modules listed as being owned by me, but they are really owned by wangke, correcting.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
9397
b16e349d18c5 the easy part of the reorg (most files moved around)
laca
parents:
diff changeset 
     1
 
--- openjade-1.3.2.orig/config/configure.in	Mon Jan  5 18:00:49 2004
b16e349d18c5 the easy part of the reorg (most files moved around)
laca
parents:
diff changeset 
     2
 
+++ openjade-1.3.2/config/configure.in	Mon Jan  5 18:03:02 2004
b16e349d18c5 the easy part of the reorg (most files moved around)
laca
parents:
diff changeset 
     3
 
@@ -130,6 +130,9 @@
b16e349d18c5 the easy part of the reorg (most files moved around)
laca
parents:
diff changeset 
     4
 
               [define this to compile explicit template instantiations])
b16e349d18c5 the easy part of the reorg (most files moved around)
laca
parents:
diff changeset 
     5
 
             CXXFLAGS="$CXXFLAGS -fno-implicit-templates"
b16e349d18c5 the easy part of the reorg (most files moved around)
laca
parents:
diff changeset 
     6
 
         fi
b16e349d18c5 the easy part of the reorg (most files moved around)
laca
parents:
diff changeset 
     7
 
+    else
b16e349d18c5 the easy part of the reorg (most files moved around)
laca
parents:
diff changeset 
     8
 
+        AC_DEFINE(SP_DEFINE_TEMPLATES,1,
b16e349d18c5 the easy part of the reorg (most files moved around)
laca
parents:
diff changeset 
     9
 
+          [define this to include template definitions in the headers])
b16e349d18c5 the easy part of the reorg (most files moved around)
laca
parents:
diff changeset 
    10
 
     fi
b16e349d18c5 the easy part of the reorg (most files moved around)
laca
parents:
diff changeset 
    11
 
     ;;
b16e349d18c5 the easy part of the reorg (most files moved around)
laca
parents:
diff changeset 
    12
 
 esac
b16e349d18c5 the easy part of the reorg (most files moved around)
laca
parents:
diff changeset 
    13
 
--- openjade-1.3.2/style/primitive.cxx.orig	Tue Jan  6 05:45:14 2004
b16e349d18c5 the easy part of the reorg (most files moved around)
laca
parents:
diff changeset 
    14
 
+++ openjade-1.3.2/style/primitive.cxx	Tue Jan  6 05:45:39 2004
b16e349d18c5 the easy part of the reorg (most files moved around)
laca
parents:
diff changeset 
    15
 
@@ -5047,7 +5047,7 @@
b16e349d18c5 the easy part of the reorg (most files moved around)
laca
parents:
diff changeset 
    16
 
     if (!argv[1]->exactIntegerValue(n2))
b16e349d18c5 the easy part of the reorg (most files moved around)
laca
parents:
diff changeset 
    17
 
       return argError(interp, loc,
b16e349d18c5 the easy part of the reorg (most files moved around)
laca
parents:
diff changeset 
    18
 
   		      InterpreterMessages::notAnExactInteger, 1, argv[1]);
b16e349d18c5 the easy part of the reorg (most files moved around)
laca
parents:
diff changeset 
    19
 
-    return new (interp) QuantityObj(pow(d1,n2), dim1*n2);
b16e349d18c5 the easy part of the reorg (most files moved around)
laca
parents:
diff changeset 
    20
 
+    return new (interp) QuantityObj(pow(d1,(int)n2), dim1*n2);
b16e349d18c5 the easy part of the reorg (most files moved around)
laca
parents:
diff changeset 
    21
 
   }
b16e349d18c5 the easy part of the reorg (most files moved around)
laca
parents:
diff changeset 
    22
 
   else {
b16e349d18c5 the easy part of the reorg (most files moved around)
laca
parents:
diff changeset 
    23
 
     if ((q2 == ELObj::noQuantity) || (dim2 != 0))
upstream/oracle/spec-files