Searched refs:merge (Results 1 - 25 of 155) sorted by relevance

1234567

/external/emma/core/java12/com/vladium/emma/data/
H A DIMergeable.java27 IMergeable merge (IMergeable data); method in interface:IMergeable
/external/clang/
H A DREADME.android9 * merge conflicts with upstream on those parts.
11 * The file contains useful hints when we try to resolve future 3-way merge
24 * Recent downstreaming on 2012/8/23: Synced to r162325 (srhines for merge questions)
25 * Recent downstreaming on 2012/8/3: Synced to r160673 (sliao for merge questions)
26 * Recent downstreaming on 2012/4/24: Synced to r155088 (sliao for merge questions)
27 * Recent downstreaming on 2012/3/24: Synced to r153220 (sliao & srhines for merge questions)
28 * Recent downstreaming on 2012/3/5: Synced to r152062 (srhines & sliao for merge questions)
29 * Recent downstreaming on 2011/12/17: Synced to r146715 (loganchien & sliao for merge questions)
30 * Recent downstreaming on 2011/11/26: Synced to r145117 (loganchien & sliao for merge questions)
31 * Recent downstreaming on 2011/11/17: Synced to r144605 (loganchien & sliao for merge question
[all...]
/external/dexmaker/src/dx/java/com/android/dx/util/
H A DIntSet.java50 * @param other {@code non-null;} other set to merge with.
52 void merge(IntSet other); method in interface:IntSet
/external/llvm/
H A DREADME.android9 * merge conflicts with upstream on those parts.
11 * The file contains useful hints when we try to resolve future 3-way merge
24 * Recent downstreaming on 2012/8/23: Synced to r162314 (Contact srhines for merge questions.)
25 * Recent downstreaming on 2012/8/3: Synced to r160668 (Contact sliao for merge questions.)
26 * Cherry-pick on 2012/05/23: https://llvm.org/svn/llvm-project/llvm/trunk@157317 (Contact srhines for merge questions.)
27 * Recent downstreaming on 2012/4/24: Synced to r155090 (Contact sliao for merge questions.)
28 * Recent downstreaming on 2012/3/24: Synced to r153224 (Contact sliao & srhines for merge questions.)
29 * Recent downstreaming on 2012/3/5: Synced to r152063 (Contact srhines & sliao for merge questions.)
30 * Recent downstreaming on 2011/12/17: Synced to r146714 (Contact loganchien & sliao for merge questions.)
31 * Recent downstreaming on 2011/11/26: Synced to r145126 (Contact loganchien & sliao for merge question
[all...]
/external/emma/core/java12/com/vladium/emma/rt/
H A DRTCoverageDataPersister.java38 final File outFile, final boolean merge)
54 DataFactory.persist (cdataView, outFile, merge);
61 log.info ("runtime coverage data " + (merge ? "merged into" : "written to") + " [" + outFile.getAbsolutePath () + "] {in " + (end - start) + " ms}");
37 dumpCoverageData(final ICoverageData cdata, final boolean useSnapshot, final File outFile, final boolean merge) argument
H A DRTExitHook.java105 RTExitHook (final Class RT, final ICoverageData cdata, final File outFile, final boolean merge) argument
111 m_merge = merge;
H A DRT.java145 * @param merge
148 public static synchronized void dumpCoverageData (File outFile, final boolean merge, final boolean stopDataCollection) argument
156 RTCoverageDataPersister.dumpCoverageData (cdata, ! stopDataCollection, outFile, merge);
/external/compiler-rt/
H A DREADME.android9 * merge conflicts with upstream on those parts.
11 * The file contains useful hints when we try to resolve future 3-way merge
18 * Recent downstreaming on 2012/08/23: Synced to r162279 (Contact srhines for merge questions.)
19 * Recent downstreaming on 2012/08/15: Synced to r159129 (Contact sliao for merge questions.)
20 * Cherry-pick on 2012/07/27: https://llvm.org/svn/llvm-project/compiler-rt/trunk@160853 for ASan (Contact srhines for merge questions.)
21 * Cherry-pick on 2012/05/23: https://llvm.org/svn/llvm-project/compiler-rt/trunk@157318 for ASan (Contact srhines for merge questions.)
22 * Recent downstreaming on 2012/04/25: Synced to r155350 (Contact sliao for merge questions.)
23 * Recent downstreaming on 2012/03/08: Synced to r152058 (Contact srhines for merge questions.)
/external/chromium/net/base/
H A Dupload_data_stream.h70 static void set_merge_chunks(bool merge) { merge_chunks_ = merge; } argument
/external/llvm/utils/release/
H A Dmerge.sh2 #===-- merge.sh - Test the LLVM release candidates -------------------------===#
22 echo " -proj PROJECT The project to merge the result into"
23 echo " -rev NUM The revision to merge into the project"
61 tempfile=`mktemp /tmp/merge.XXXXXX` || exit 1
70 svn merge -c $rev https://llvm.org/svn/llvm-project/$proj/trunk . || exit 1
/external/nist-sip/java/gov/nist/core/
H A DHostPort.java150 public void merge(Object mergeObject) { method in class:HostPort
151 super.merge (mergeObject);
/external/protobuf/java/src/test/java/com/google/protobuf/
H A DTextFormatTest.java284 TextFormat.merge(allFieldsSetText, builder);
290 TextFormat.merge(new StringReader(allFieldsSetText), builder);
296 TextFormat.merge(allExtensionsSetText,
328 TextFormat.merge(original, builder);
334 TextFormat.merge(exoticText, builder);
347 TextFormat.merge(messageSetText, extensionRegistry, builder);
362 TextFormat.merge("optional_nested_enum: 2", builder);
368 TextFormat.merge("OptionalGroup: < a: 1 >", builder);
375 TextFormat.merge(
387 TextFormat.merge(tex
[all...]
/external/stlport/test/unit/
H A Dmerge_test.cpp41 merge((int*)numbers1, (int*)numbers1 + 5, (int*)numbers2, (int*)numbers2 + 5, (int*)result);
62 merge(v1.begin(), v1.end(), v2.begin(), v2.end(), result.begin());
85 merge(v1.begin(), v1.end(), v2.begin(), v2.end(), result.begin(), greater<int>() );
/external/javassist/src/main/javassist/bytecode/analysis/
H A DAnalyzer.java197 merge(queue, frame, lookAhead(iter, pos));
200 merge(queue, frame, target);
203 merge(queue, frame, lookAhead(iter, pos));
276 private void merge(IntQueue queue, Frame frame, int target) { method in class:Analyzer
284 changed = old.merge(frame);
301 merge(queue, newFrame, exception.handler);
328 newType = oldType.merge(newType);
350 merge(queue, frame, pos + iter.s32bitAt(index));
357 merge(queue, frame, target);
404 merge(queu
[all...]
H A DFrame.java175 * @param frame the frame to merge the stack from
186 Type merged = prev.merge(frame.stack[i]);
205 * @param frame the frame to merge with
206 * @return true if any changes to this frame where made by this merge
208 public boolean merge(Frame frame) { method in class:Frame
215 Type merged = prev.merge(frame.locals[i]);
/external/iproute2/tc/
H A Dm_xt_old.c96 struct option *merge; local
104 merge = malloc(sizeof (struct option) * (num_new + num_old + 1));
105 memcpy(merge, oldopts, num_old * sizeof (struct option));
107 merge[num_old + i] = newopts[i];
108 merge[num_old + i].val += *option_offset;
110 memset(merge + num_old + num_new, 0, sizeof (struct option));
112 return merge;
/external/emma/ant/ant14/com/vladium/emma/instr/
H A DFilterCfg.java45 final String [] specs = Strings.merge (new String [] {value}, COMMA_DELIMITERS, true);
73 final String [] specs = Strings.merge (new String [] {value}, COMMA_DELIMITERS, true);
95 final String [] specs = Strings.merge (new String [] {value}, COMMA_DELIMITERS, true);
H A DinstrTask.java147 // merge attribute:
149 public void setMerge (final boolean merge) argument
151 m_outFileMerge = merge ? Boolean.TRUE : Boolean.FALSE;
/external/nist-sip/java/gov/nist/javax/sip/header/
H A DSIPObjectList.java75 * Do a merge of the GenericObjects contained in this list with the
78 * merge of the given objects.
81 * an object by object merge with. Note that no new objects are
93 outerObj.merge(innerObj);
/external/proguard/src/proguard/optimize/info/
H A DClassOptimizationInfo.java126 public void merge(ClassOptimizationInfo other) method in class:ClassOptimizationInfo
/external/v8/tools/
H A Dmerge-to-branch.sh31 BRANCHNAME=prepare-merge
32 PERSISTFILE_BASENAME=/tmp/v8-merge-to-branch-tempfile
45 Performs the necessary steps to merge revisions from bleeding_edge
51 -p Specify a patch file to apply as part of the merge
93 # If there is a merge in progress, abort.
95 && die "A merge is already in progress"
106 [[ -n "$MERGE_TO_BRANCH" ]] || die "Please specify a branch to merge to"
/external/openssl/crypto/engine/
H A Deng_dyn.c419 char *merge = DSO_merge(ctx->dynamic_dso, ctx->DYNAMIC_LIBNAME, s); local
420 if(!merge)
422 if(DSO_load(ctx->dynamic_dso, merge, NULL, 0))
425 OPENSSL_free(merge);
428 OPENSSL_free(merge);
/external/qemu/distrib/sdl-1.2.15/build-scripts/
H A Dfatbuild.sh60 # make, make-ppc, make-x86, make-x64, merge
76 merge="yes"
96 merge="yes"
107 merge)
108 merge="yes"
147 echo "Usage: $0 [all|configure[-ppc|-x86|-x64]|make[-ppc|-x86|-x64]|merge|install|clean[-ppc|-x86|-x64]]"
214 if test x$merge = xyes; then
/external/jmonkeyengine/engine/src/core/com/jme3/font/
H A DBitmapFont.java263 * If two font have the same style, merge will fail.
267 public void merge(BitmapFont newFont) { method in class:BitmapFont
268 charSet.merge(newFont.charSet);
/external/skia/include/pdf/
H A DSkPDFFont.h30 void merge(const SkPDFGlyphSet& usage);
60 void merge(const SkPDFGlyphSetMap& usage);

Completed in 934 milliseconds

1234567