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 elaine
Tue, 14 Jul 2009 12:13:46 +0000
changeset 16021 9d984e35c938
child 18075 194cbe759c95
permissions -rw-r--r--
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.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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 
     1
 
--- ptlib-2.6.4/src/ptlib/common/contain.cxx.orig	2009-07-13 09:40:42.071317000 +0800
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 
     2
 
+++ ptlib-2.6.4/src/ptlib/common/contain.cxx	2009-07-13 14:10:16.248768000 +0800
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 
     3
 
@@ -67,7 +67,7 @@
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
 
   public:
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
 
     Type * Allocate(size_t n)
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
 
-    { return a.allocate(n); }
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
 
+    { return (Type *)a.allocate(n); }
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
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
 
     void Deallocate(Type * p, size_t n)
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
 
     { a.deallocate(p, n); }
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 
    12
 
@@ -110,7 +110,7 @@
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
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
 
 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 
    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(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 
    17
 
+  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 
    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
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 
    21
 
@@ -122,7 +122,7 @@
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
 
   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 
    23
 
   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 
    24
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(*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 
    26
 
+  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 
    27
 
   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 
    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
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 
    30
 
@@ -196,7 +196,7 @@
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
 
     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 
    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
 
   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 
    34
 
-  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 
    35
 
+  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 
    36
 
   --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 
    37
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
 
   return PFalse;
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 
    39
 
@@ -387,7 +387,7 @@
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 
    40
 
     }
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 
    41
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 
    42
 
     --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 
    43
 
-    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 
    44
 
+    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 
    45
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 
    46
 
   } 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 
    47
upstream/oracle/spec-files