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-05-allocator-and-new.diff
author rohinis
Tue, 29 Nov 2011 17:32:55 +0000
branchs11express-2010-11
changeset 22234 c23e64da3e06
parent 18075 194cbe759c95
permissions -rw-r--r--
2011-11-29 Rohini S <[email protected]> * patches/Python26-22-audio.diff: Fixes CVE-2010-1634 * specs/SUNWPython26.spec: Fixes CR 7085446
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
18075
194cbe759c95 2010-06-04 Brian Lu <[email protected]>
hawklu
parents: 16021
diff changeset 
     1
 
--- ptlib-2.6.7/src/ptlib/common/contain.cxx.old	2010-05-31 14:40:58.715962590 +0800
194cbe759c95 2010-06-04 Brian Lu <[email protected]>
hawklu
parents: 16021
diff changeset 
     2
 
+++ ptlib-2.6.7/src/ptlib/common/contain.cxx	2010-05-31 14:42:39.778212543 +0800
194cbe759c95 2010-06-04 Brian Lu <[email protected]>
hawklu
parents: 16021
diff changeset 
     3
 
@@ -122,7 +122,7 @@
16021
9d984e35c938 Bump Ekiga to 3.2.5. Bump PTLib to 2.6.4 and OPAL to 3.6.4. Remove upstream patches and add new patches. Enable URL feature in PTLib.
elaine
parents:
diff changeset 
     4
9d984e35c938 Bump Ekiga to 3.2.5. Bump PTLib to 2.6.4 and OPAL to 3.6.4. Remove upstream patches and add new patches. Enable URL feature in PTLib.
elaine
parents:
diff changeset 
     5
 
 PContainer::PContainer(PINDEX initialSize)
9d984e35c938 Bump Ekiga to 3.2.5. Bump PTLib to 2.6.4 and OPAL to 3.6.4. Remove upstream patches and add new patches. Enable URL feature in PTLib.
elaine
parents:
diff changeset 
     6
 
 {
9d984e35c938 Bump Ekiga to 3.2.5. Bump PTLib to 2.6.4 and OPAL to 3.6.4. Remove upstream patches and add new patches. Enable URL feature in PTLib.
elaine
parents:
diff changeset 
     7
 
-  reference = PContainerReference_new(initialSize);
9d984e35c938 Bump Ekiga to 3.2.5. Bump PTLib to 2.6.4 and OPAL to 3.6.4. Remove upstream patches and add new patches. Enable URL feature in PTLib.
elaine
parents:
diff changeset 
     8
 
+  reference = new PContainerReference(initialSize);
9d984e35c938 Bump Ekiga to 3.2.5. Bump PTLib to 2.6.4 and OPAL to 3.6.4. Remove upstream patches and add new patches. Enable URL feature in PTLib.
elaine
parents:
diff changeset 
     9
 
   PAssert(reference != NULL, POutOfMemory);
9d984e35c938 Bump Ekiga to 3.2.5. Bump PTLib to 2.6.4 and OPAL to 3.6.4. Remove upstream patches and add new patches. Enable URL feature in PTLib.
elaine
parents:
diff changeset 
    10
 
 }
9d984e35c938 Bump Ekiga to 3.2.5. Bump PTLib to 2.6.4 and OPAL to 3.6.4. Remove upstream patches and add new patches. Enable URL feature in PTLib.
elaine
parents:
diff changeset 
    11
18075
194cbe759c95 2010-06-04 Brian Lu <[email protected]>
hawklu
parents: 16021
diff changeset 
    12
 
@@ -134,7 +134,7 @@
16021
9d984e35c938 Bump Ekiga to 3.2.5. Bump PTLib to 2.6.4 and OPAL to 3.6.4. Remove upstream patches and add new patches. Enable URL feature in PTLib.
elaine
parents:
diff changeset 
    13
 
   PAssert(cont != NULL, PInvalidParameter);
9d984e35c938 Bump Ekiga to 3.2.5. Bump PTLib to 2.6.4 and OPAL to 3.6.4. Remove upstream patches and add new patches. Enable URL feature in PTLib.
elaine
parents:
diff changeset 
    14
 
   PAssert2(cont->reference != NULL, cont->GetClass(), "Clone of deleted container");
9d984e35c938 Bump Ekiga to 3.2.5. Bump PTLib to 2.6.4 and OPAL to 3.6.4. Remove upstream patches and add new patches. Enable URL feature in PTLib.
elaine
parents:
diff changeset 
    15
9d984e35c938 Bump Ekiga to 3.2.5. Bump PTLib to 2.6.4 and OPAL to 3.6.4. Remove upstream patches and add new patches. Enable URL feature in PTLib.
elaine
parents:
diff changeset 
    16
 
-  reference = PContainerReference_new(*cont->reference);
9d984e35c938 Bump Ekiga to 3.2.5. Bump PTLib to 2.6.4 and OPAL to 3.6.4. Remove upstream patches and add new patches. Enable URL feature in PTLib.
elaine
parents:
diff changeset 
    17
 
+  reference = new PContainerReference(*cont->reference);
9d984e35c938 Bump Ekiga to 3.2.5. Bump PTLib to 2.6.4 and OPAL to 3.6.4. Remove upstream patches and add new patches. Enable URL feature in PTLib.
elaine
parents:
diff changeset 
    18
 
   PAssert(reference != NULL, POutOfMemory);
9d984e35c938 Bump Ekiga to 3.2.5. Bump PTLib to 2.6.4 and OPAL to 3.6.4. Remove upstream patches and add new patches. Enable URL feature in PTLib.
elaine
parents:
diff changeset 
    19
 
 }
9d984e35c938 Bump Ekiga to 3.2.5. Bump PTLib to 2.6.4 and OPAL to 3.6.4. Remove upstream patches and add new patches. Enable URL feature in PTLib.
elaine
parents:
diff changeset 
    20
18075
194cbe759c95 2010-06-04 Brian Lu <[email protected]>
hawklu
parents: 16021
diff changeset 
    21
 
@@ -208,7 +208,7 @@
16021
9d984e35c938 Bump Ekiga to 3.2.5. Bump PTLib to 2.6.4 and OPAL to 3.6.4. Remove upstream patches and add new patches. Enable URL feature in PTLib.
elaine
parents:
diff changeset 
    22
 
     return PTrue;
9d984e35c938 Bump Ekiga to 3.2.5. Bump PTLib to 2.6.4 and OPAL to 3.6.4. Remove upstream patches and add new patches. Enable URL feature in PTLib.
elaine
parents:
diff changeset 
    23
9d984e35c938 Bump Ekiga to 3.2.5. Bump PTLib to 2.6.4 and OPAL to 3.6.4. Remove upstream patches and add new patches. Enable URL feature in PTLib.
elaine
parents:
diff changeset 
    24
 
   PContainerReference * oldReference = reference;
9d984e35c938 Bump Ekiga to 3.2.5. Bump PTLib to 2.6.4 and OPAL to 3.6.4. Remove upstream patches and add new patches. Enable URL feature in PTLib.
elaine
parents:
diff changeset 
    25
 
-  reference = PContainerReference_new(*reference);
9d984e35c938 Bump Ekiga to 3.2.5. Bump PTLib to 2.6.4 and OPAL to 3.6.4. Remove upstream patches and add new patches. Enable URL feature in PTLib.
elaine
parents:
diff changeset 
    26
 
+  reference = new PContainerReference(*reference);
9d984e35c938 Bump Ekiga to 3.2.5. Bump PTLib to 2.6.4 and OPAL to 3.6.4. Remove upstream patches and add new patches. Enable URL feature in PTLib.
elaine
parents:
diff changeset 
    27
 
   --oldReference->count;
9d984e35c938 Bump Ekiga to 3.2.5. Bump PTLib to 2.6.4 and OPAL to 3.6.4. Remove upstream patches and add new patches. Enable URL feature in PTLib.
elaine
parents:
diff changeset 
    28
9d984e35c938 Bump Ekiga to 3.2.5. Bump PTLib to 2.6.4 and OPAL to 3.6.4. Remove upstream patches and add new patches. Enable URL feature in PTLib.
elaine
parents:
diff changeset 
    29
 
   return PFalse;
18075
194cbe759c95 2010-06-04 Brian Lu <[email protected]>
hawklu
parents: 16021
diff changeset 
    30
 
@@ -397,7 +397,7 @@
16021
9d984e35c938 Bump Ekiga to 3.2.5. Bump PTLib to 2.6.4 and OPAL to 3.6.4. Remove upstream patches and add new patches. Enable URL feature in PTLib.
elaine
parents:
diff changeset 
    31
 
     }
9d984e35c938 Bump Ekiga to 3.2.5. Bump PTLib to 2.6.4 and OPAL to 3.6.4. Remove upstream patches and add new patches. Enable URL feature in PTLib.
elaine
parents:
diff changeset 
    32
9d984e35c938 Bump Ekiga to 3.2.5. Bump PTLib to 2.6.4 and OPAL to 3.6.4. Remove upstream patches and add new patches. Enable URL feature in PTLib.
elaine
parents:
diff changeset 
    33
 
     --reference->count;
9d984e35c938 Bump Ekiga to 3.2.5. Bump PTLib to 2.6.4 and OPAL to 3.6.4. Remove upstream patches and add new patches. Enable URL feature in PTLib.
elaine
parents:
diff changeset 
    34
 
-    reference = PContainerReference_new(newSize);
9d984e35c938 Bump Ekiga to 3.2.5. Bump PTLib to 2.6.4 and OPAL to 3.6.4. Remove upstream patches and add new patches. Enable URL feature in PTLib.
elaine
parents:
diff changeset 
    35
 
+    reference = new PContainerReference(newSize);
9d984e35c938 Bump Ekiga to 3.2.5. Bump PTLib to 2.6.4 and OPAL to 3.6.4. Remove upstream patches and add new patches. Enable URL feature in PTLib.
elaine
parents:
diff changeset 
    36
9d984e35c938 Bump Ekiga to 3.2.5. Bump PTLib to 2.6.4 and OPAL to 3.6.4. Remove upstream patches and add new patches. Enable URL feature in PTLib.
elaine
parents:
diff changeset 
    37
 
   } else {
9d984e35c938 Bump Ekiga to 3.2.5. Bump PTLib to 2.6.4 and OPAL to 3.6.4. Remove upstream patches and add new patches. Enable URL feature in PTLib.
elaine
parents:
diff changeset 
    38
upstream/oracle/spec-files