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/ptlib-09-build-fail.diff
author yippi
Mon, 27 Sep 2010 21:07:51 +0000
changeset 20108 51df67ca9307
parent 16655 9fc6de9605c2
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:
16655
9fc6de9605c2 2009-09-25 Brian Lu <[email protected]>
hawklu
parents:
diff changeset 
     1
 
--- ptlib-2.6.5/src/ptlib/common/contain.cxx.old	2009-09-24 17:04:38.403978000 +0800
9fc6de9605c2 2009-09-25 Brian Lu <[email protected]>
hawklu
parents:
diff changeset 
     2
 
+++ ptlib-2.6.5/src/ptlib/common/contain.cxx	2009-09-24 17:05:00.654128000 +0800
9fc6de9605c2 2009-09-25 Brian Lu <[email protected]>
hawklu
parents:
diff changeset 
     3
 
@@ -77,7 +77,7 @@
9fc6de9605c2 2009-09-25 Brian Lu <[email protected]>
hawklu
parents:
diff changeset 
     4
 
       if (new_n == old_n)
9fc6de9605c2 2009-09-25 Brian Lu <[email protected]>
hawklu
parents:
diff changeset 
     5
 
         return p;
9fc6de9605c2 2009-09-25 Brian Lu <[email protected]>
hawklu
parents:
diff changeset 
     6
9fc6de9605c2 2009-09-25 Brian Lu <[email protected]>
hawklu
parents:
diff changeset 
     7
 
-      Type * np = a.allocate(new_n);
9fc6de9605c2 2009-09-25 Brian Lu <[email protected]>
hawklu
parents:
diff changeset 
     8
 
+      Type * np = (Type*)a.allocate(new_n);
9fc6de9605c2 2009-09-25 Brian Lu <[email protected]>
hawklu
parents:
diff changeset 
     9
 
       memcpy(np, p, (new_n < old_n) ? new_n : old_n );
9fc6de9605c2 2009-09-25 Brian Lu <[email protected]>
hawklu
parents:
diff changeset 
    10
 
       a.deallocate(p, old_n);
9fc6de9605c2 2009-09-25 Brian Lu <[email protected]>
hawklu
parents:
diff changeset 
    11
upstream/oracle/spec-files