Changeset 100490 in vbox for trunk/src/VBox/Runtime
Legend:
- Unmodified
- Added
- Removed
-
trunk
- Property svn:mergeinfo
-
old new 10 10 /branches/VBox-5.2:119536,120083,120099,120213,120221,120239,123597-123598,123600-123601,123755,124260,124263,124271,124273,124277-124279,124284-124286,124288-124290,125768,125779-125780,125812 11 11 /branches/VBox-6.0:130474-130475,130477,130479,131352 12 /branches/VBox-6.1:139660,139797,141521,141567-141568,141588-141590,141592-141595,141652,141920,142071,158257 12 /branches/VBox-6.1:139660,139797,141521,141567-141568,141588-141590,141592-141595,141652,141920,142071,158257-158258 13 13 /branches/VBox-7.0:156229,156768 14 14 /branches/aeichner/vbox-chromium-cleanup:129816,129818-129851,129853-129861,129871-129872,129876,129880,129882,130013-130015,130036,130094-130095
-
- Property svn:mergeinfo
-
trunk/src/VBox
- Property svn:mergeinfo
-
old new 10 10 /branches/VBox-5.2/src/VBox:119536,120083,120099,120213,120221,120239,123597-123598,123600-123601,123755,124263,124273,124277-124279,124284-124286,124288-124290,125768,125779-125780,125812,127158-127159,127162-127167,127180 11 11 /branches/VBox-6.0/src/VBox:130474-130475,130477,130479,131352 12 /branches/VBox-6.1/src/VBox:141521,141567-141568,141588-141590,141592-141595,141652,141920,158257 12 /branches/VBox-6.1/src/VBox:141521,141567-141568,141588-141590,141592-141595,141652,141920,158257-158258 13 13 /branches/VBox-7.0/src/VBox:156229,156768 14 14 /branches/aeichner/vbox-chromium-cleanup/src/VBox:129818-129851,129853-129861,129871-129872,129876,129880,129882,130013-130015,130094-130095
-
- Property svn:mergeinfo
-
trunk/src/VBox/Runtime/common/asn1/asn1-ut-dyntype.cpp
r98103 r100490 121 121 122 122 123 RTDECL(int) RTAsn1DynType_SetToObjId(PRTASN1DYNTYPE pThis, PCRTASN1OBJID pSrc, PCRTASN1ALLOCATORVTABLE pAllocator) 124 { 125 RTAsn1DynType_Delete(pThis); 126 pThis->enmType = RTASN1TYPE_OBJID; 127 return RTAsn1ObjId_Clone(&pThis->u.ObjId, pSrc, pAllocator); 128 } 129 130 123 131 RTDECL(int) RTAsn1DynType_Enum(PRTASN1DYNTYPE pThis, PFNRTASN1ENUMCALLBACK pfnCallback, uint32_t uDepth, void *pvUser) 124 132 {
Note:
See TracChangeset
for help on using the changeset viewer.