Home	Sort by relevance Sort by last modified time

Full Search Definition Symbol File Path History   | | Help

    Searched full:conflicts (Results 26 - 50 of 1300) sorted by null

12 3 4 5 6 7 8 91011>>

/external/chromium_org/chrome/browser/resources/sync_internals/
types.html	18 <th>Server Overwrite Conflicts</th> 19 <th>Local Overwrite Conflicts</th> 23 <th>Commit Conflicts</th>
/external/chromium_org/chrome/browser/ui/webui/
conflicts_ui.h	17 // The Web UI handler for about:conflicts.
/external/clang/test/SemaCXX/
extern-c.cpp	19 float test2_x; // expected-error {{declaration of 'test2_x' in global scope conflicts with declaration with C language linkage}} 39 static float test4_b; // expected-error {{declaration of 'test4_b' in global scope conflicts with declaration with C language linkage}} 56 static float test5_b; // expected-error {{declaration of 'test5_b' in global scope conflicts with declaration with C language linkage}} 126 void lookup_in_global_f(int); // expected-error {{conflicts with declaration in global scope}} 130 int lookup_in_global_g; // expected-error {{conflicts with declaration with C language linkage}} 180 extern "C" void global_var_vs_extern_c_fn_1(); // expected-error {{conflicts with declaration in global scope}} 183 int global_var_vs_extern_c_fn_2; // expected-error {{conflicts with declaration with C language linkage}} 186 extern "C" double global_var_vs_extern_c_var_1; // expected-error {{conflicts with declaration in global scope}} 189 int global_var_vs_extern_c_var_2; // expected-error {{conflicts with declaration with C language linkage}}
/external/protobuf/
protobuf-lite.pc.in	13 # Conflicts: protobuf
protobuf.pc.in	13 # Conflicts: protobuf-lite
/external/qemu/distrib/sdl-1.2.15/
sdl.pc.in	12 Conflicts:
/prebuilts/misc/common/swig/include/2.0.11/go/
gokw.swg	4 #define GOBN(x) %builtinwarn("'" `x` "' conflicts with a built-in name in Go") "::"`x`
/external/bison/tests/
conflicts.at	1 # Exercising Bison on conflicts. -*- Autotest -*- 19 AT_BANNER([[Conflicts.]]) 41 [[input.y:4.9: warning: rule useless in parser due to conflicts: e: /* empty */ 45 [[input.y:4.9: warning: rule useless in parser due to conflicts 513 [[input.y: conflicts: 2 shift/reduce 523 [[input.y: conflicts: 2 shift/reduce 533 [[input.y: conflicts: 2 shift/reduce 543 ## Unresolved SR Conflicts. ## 546 AT_SETUP([Unresolved SR Conflicts]) 557 [input.y: conflicts: 1 shift/reduc     [all...]
/external/bison/src/
conflicts.c	1 /* Find and resolve or report lookahead conflicts for bison, 28 #include "conflicts.h" 41 static char *conflicts; variable 322 | Solve the S/R conflicts of state S using the | 324 | conflicts. ERRORS can be used as storage to compute the list of | 370 for conflicts not resolved above. */ 374 conflicts[s->number] = 1; 381 | Solve all the S/R conflicts using the precedence/associativity, | 382 | and flag as inconsistent the states that still have conflicts. | 392 conflicts = xcalloc (nstates, sizeof *conflicts)     [all...]
/external/chromium_org/sync/engine/
directory_update_handler.cc	139 // Resolve the simple conflicts we just detected. 162 // Encryption conflicts should remain unchanged by the resolution of simple 163 // conflicts. Those can only be solved by updating our nigori key bag. 167 // Hierarchy conflicts should also remain unchanged, for reasons that are 168 // more subtle. Hierarchy conflicts exist when the application of a pending 170 // inconsistent. The resolution of simple conflicts could never affect the 171 // hierarchy conflicting item directly, because hierarchy conflicts are not 178 // There should be no simple conflicts remaining. We know this because the 179 // resolver should have resolved all the conflicts we detected last time 180 // and, by the two previous assertions, that no conflicts have bee     [all...]
conflict_util.h	5 // Utility functions that act on syncable::MutableEntry to resolve conflicts.
/external/e2fsprogs/debian/attic/libs/
control	10 Conflicts: e2fsprogsg, dump (<< 0.4b4-4), quota (<< 1.55-8.1) 23 Conflicts: e2fsprogs (<< 1.10-6), comerr2 34 Conflicts: e2fsprogs (<< 1.10-6), ss2 45 Conflicts: e2fsprogs (<= 1.10-7) 58 Conflicts: e2fsprogs (<< 1.10-6), comerr-dev 69 Conflicts: e2fsprogs (<< 1.10-6), ss-dev 84 Conflicts: e2fsprogs (<< 1.10-6), e2fslibs-dev
/frameworks/webview/chromium/tools/
merge_common.py	148 """Checks for conflicts and commits once they are resolved. 150 Certain conflicts are resolved automatically; if any remain, the user is 155 unattended: If running unattended, abort on conflicts. 158 TemporaryMergeError: If there are conflicts in unattended mode. 182 conflicts = re.findall(r'^((DD|AU|UD|UA|DU|AA|UU) [^\n]+)$', status, 184 if not conflicts: 188 raise TemporaryMergeError('Cannot resolve merge conflicts.') 189 conflicts_string = '\n'.join([x[0] for x in conflicts]) 191 ('The following conflicts exist and must be resolved.\n\n%s\n\nWhen '
/external/chromium_org/third_party/WebKit/Source/bindings/tests/idls/core/
TestInterface2.idl	38 Custom=Wrap, // Conflicts with and [Custom=ToV8], respectively 40 SetWrapperReferenceFrom=ownerNode, // Conflicts with [SetWrapperReferenceTo] 41 SpecialWrapFor=(TestInterface,TestInterfaceEmpty), // Conflicts with [Custom=ToV8]
/external/bison/po/
POTFILES.in	2 src/conflicts.c
/external/chromium_org/chrome/browser/sync_file_system/
logger.h	16 // Originally wanted to use 'logging' here, but it conflicts with
/external/chromium_org/gpu/GLES2/
gl2chromium.h	22 // emulated GL we need to use different names to avoid conflicts.
/external/chromium_org/third_party/angle/src/compiler/translator/
FlagStd140Structs.h	17 // conflicts with the "natural" unpadded type.
/external/chromium_org/third_party/libjpeg/
README.chromium	22 avoid conflicts that arise when system libraries attempt to use our libjpeg.
/external/e2fsprogs/tests/f_overfsblks/
expect.1	5 Group 0's inode bitmap at 3 conflicts with some other fs block.
/external/fio/os/
os-openbsd.h	8 /* XXX hack to avoid conflicts between rbtree.h and <sys/tree.h> */
/external/libunwind/include/
libunwind.h	1 /* Provide a real file - not a symlink - as it would cause multiarch conflicts
libunwind.h.in	1 /* Provide a real file - not a symlink - as it would cause multiarch conflicts
/external/libunwind/include/tdep/
dwarf-config.h	1 /* Provide a real file - not a symlink - as it would cause multiarch conflicts
jmpbuf.h	1 /* Provide a real file - not a symlink - as it would cause multiarch conflicts

Completed in 2103 milliseconds

12 3 4 5 6 7 8 91011>>