Home
last modified time | relevance | path

Searched refs:merge (Results 1 – 25 of 337) sorted by relevance

12345678910>>...14

/external/clang/
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 questions)
[all …]
/external/llvm/
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 …2/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 quest…
31 * Recent downstreaming on 2011/11/26: Synced to r145126 (Contact loganchien & sliao for merge quest…
[all …]
/external/compiler-rt/
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 …/llvm.org/svn/llvm-project/compiler-rt/trunk@160853 for ASan (Contact srhines for merge questions.)
21 …/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/clang/test/Modules/Inputs/
Dmodule.map50 header "redecl-merge-top.h"
51 explicit module Explicit { header "redecl-merge-top-explicit.h" }
54 header "redecl-merge-left.h"
58 header "redecl-merge-left-left.h"
62 header "redecl-merge-right.h"
66 header "redecl-merge-bottom.h"
/external/bison/tests/
Dglr-regression.at47 StartSymbol: E { $$=0; } %merge <exprMerge>
50 E: E 'P' E { $$=1; printf("E -> E 'P' E\n"); } %merge <exprMerge>
51 | 'B' { $$=2; printf("E -> 'B'\n"); } %merge <exprMerge>
260 NT1 : P1 T1 O1 T2 P2 { $$ = RULE(2); } %merge<MergeRule>
263 NT2 : NT1 { $$ = RULE(3); } %merge<MergeRule>
264 | P1 NT1 O1 T3 P2 { $$ = RULE(4); } %merge<MergeRule>
267 NT3 : T3 { $$ = RULE(5); } %merge<MergeRule>
268 | P1 NT1 O1 T3 P2 { $$ = RULE(6); } %merge<MergeRule>
271 NT4 : NT3 { $$ = RULE(7); } %merge<MergeRule>
272 | NT2 { $$ = RULE(8); } %merge<MergeRule>
[all …]
Dcxx-type.at441 [%merge <stmtMerge>], [%merge <stmtMerge>])
448 [%merge <stmtMerge>], [%merge <stmtMerge>])
455 [%merge <stmtMerge>], [%merge <stmtMerge>])
461 [%merge <stmtMerge>],[%merge <stmtMerge>])
468 [%merge <stmtMerge>], [%merge <stmtMerge>])
/external/protobuf/java/src/test/java/com/google/protobuf/
DTextFormatTest.java284 TextFormat.merge(allFieldsSetText, builder); in testParse()
290 TextFormat.merge(new StringReader(allFieldsSetText), builder); in testParseReader()
296 TextFormat.merge(allExtensionsSetText, in testParseExtensions()
328 TextFormat.merge(original, builder); in testParseCompatibility()
334 TextFormat.merge(exoticText, builder); in testParseExotic()
347 TextFormat.merge(messageSetText, extensionRegistry, builder); in testParseMessageSet()
362 TextFormat.merge("optional_nested_enum: 2", builder); in testParseNumericEnum()
368 TextFormat.merge("OptionalGroup: < a: 1 >", builder); in testParseAngleBrackets()
375 TextFormat.merge( in testParseComment()
387 TextFormat.merge(text, TestUtil.getExtensionRegistry(), builder); in assertParseError()
[all …]
/external/javassist/src/main/javassist/bytecode/analysis/
DAnalyzer.java197 merge(queue, frame, lookAhead(iter, pos)); in analyzeNextEntry()
200 merge(queue, frame, target); in analyzeNextEntry()
203 merge(queue, frame, lookAhead(iter, pos)); in analyzeNextEntry()
276 private void merge(IntQueue queue, Frame frame, int target) { in merge() method in Analyzer
284 changed = old.merge(frame); in merge()
301 merge(queue, newFrame, exception.handler); in mergeExceptionHandlers()
328 newType = oldType.merge(newType); in mergeJsr()
350 merge(queue, frame, pos + iter.s32bitAt(index)); in mergeLookupSwitch()
357 merge(queue, frame, target); in mergeLookupSwitch()
404 merge(queue, frame, pos + iter.s32bitAt(index)); in mergeTableSwitch()
[all …]
DFrame.java186 Type merged = prev.merge(frame.stack[i]); in mergeStack()
208 public boolean merge(Frame frame) { in merge() method in Frame
215 Type merged = prev.merge(frame.locals[i]); in merge()
/external/llvm/test/Transforms/CorrelatedValuePropagation/
D2010-09-02-Trunc.ll11 br label %merge
14 br i1 %b, label %merge, label %other
19 merge:
/external/emma/core/java12/com/vladium/emma/rt/
DRTCoverageDataPersister.java38 final File outFile, final boolean merge) in dumpCoverageData() argument
54 DataFactory.persist (cdataView, outFile, merge); in dumpCoverageData()
61 …log.info ("runtime coverage data " + (merge ? "merged into" : "written to") + " [" + outFile.getAb… in dumpCoverageData()
/external/iproute2/tc/
Dm_xt_old.c96 struct option *merge; in merge_options() local
104 merge = malloc(sizeof (struct option) * (num_new + num_old + 1)); in merge_options()
105 memcpy(merge, oldopts, num_old * sizeof (struct option)); in merge_options()
107 merge[num_old + i] = newopts[i]; in merge_options()
108 merge[num_old + i].val += *option_offset; in merge_options()
110 memset(merge + num_old + num_new, 0, sizeof (struct option)); in merge_options()
112 return merge; in merge_options()
Dm_ipt.c177 struct option *merge; in merge_options() local
185 merge = malloc(sizeof (struct option) * (num_new + num_old + 1)); in merge_options()
186 memcpy(merge, oldopts, num_old * sizeof (struct option)); in merge_options()
188 merge[num_old + i] = newopts[i]; in merge_options()
189 merge[num_old + i].val += *option_offset; in merge_options()
191 memset(merge + num_old + num_new, 0, sizeof (struct option)); in merge_options()
193 return merge; in merge_options()
/external/valgrind/main/docs/internals/
Dhowto_oprofile.txt14 opreport --merge=tgid -x \
19 opreport --merge=tgid --symbols -x \
24 opreport --merge=tgid --callgraph -x \
29 opannotate --merge=tgid --source --include-file=libhb_core.c | less
/external/stlport/test/unit/
Dmerge_test.cpp41 merge((int*)numbers1, (int*)numbers1 + 5, (int*)numbers2, (int*)numbers2 + 5, (int*)result); in merge0()
62 merge(v1.begin(), v1.end(), v2.begin(), v2.end(), result.begin()); in merge1()
85 merge(v1.begin(), v1.end(), v2.begin(), v2.end(), result.begin(), greater<int>() ); in merge2()
/external/v8/tools/
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
/external/llvm/utils/release/
Dmerge.sh61 tempfile=`mktemp /tmp/merge.XXXXXX` || exit 1
70 svn merge -c $rev https://llvm.org/svn/llvm-project/$proj/trunk . || exit 1
/external/emma/core/res/
Demma_default.properties45 session.out.merge: true
52 coverage.out.merge: true
59 metadata.out.merge: true
/external/qemu/distrib/sdl-1.2.15/build-scripts/
Dfatbuild.sh76 merge="yes"
96 merge="yes"
107 merge)
108 merge="yes"
214 if test x$merge = xyes; then
/external/chromium/net/base/
Dupload_data_stream.h70 static void set_merge_chunks(bool merge) { merge_chunks_ = merge; } in set_merge_chunks() argument
/external/llvm/test/CodeGen/X86/
Dtail-threshold.ll1 ; RUN: llc -mtriple=x86_64-pc-linux-gnu -tail-merge-threshold 2 < %s | FileCheck %s
4 ; tail-merge-threshold predecessors.
D2011-01-07-LegalizeTypesCrash.ll10 %merge = insertelement <4 x i8> undef, i8 %_comp, i32 0
13 %merge5 = insertelement <4 x i8> %merge, i8 %_comp4, i32 1
/external/emma/ant/ant14/com/vladium/emma/instr/
DFilterCfg.java45 final String [] specs = Strings.merge (new String [] {value}, COMMA_DELIMITERS, true); in setValue()
73 final String [] specs = Strings.merge (new String [] {value}, COMMA_DELIMITERS, true); in setIncludes()
95 final String [] specs = Strings.merge (new String [] {value}, COMMA_DELIMITERS, true); in setExcludes()
/external/openssl/crypto/engine/
Deng_dyn.c419 char *merge = DSO_merge(ctx->dynamic_dso, ctx->DYNAMIC_LIBNAME, s); in int_load() local
420 if(!merge) in int_load()
422 if(DSO_load(ctx->dynamic_dso, merge, NULL, 0)) in int_load()
425 OPENSSL_free(merge); in int_load()
428 OPENSSL_free(merge); in int_load()
/external/nist-sip/java/gov/nist/core/
DHostPort.java150 public void merge(Object mergeObject) { in merge() method in HostPort
151 super.merge (mergeObject); in merge()

12345678910>>...14