| /external/llvm/test/Assembler/ |
| 2002-03-08-NameCollision2.ll | 4 ; declaration for a method was found, that this would cause spurious conflicts
|
| /external/chromium_org/chrome/browser/ui/webui/ |
| conflicts_ui.h | 17 // The Web UI handler for about:conflicts.
|
| /external/chromium_org/gpu/GLES2/ |
| gl2chromium.h | 15 // emulated GL we need to use different names to avoid conflicts.
|
| /external/clang/test/Modules/ |
| linkage-merge.cpp | 10 // expected-error@-1 {{declaration conflicts with target of using declaration already in scope}}
|
| /external/e2fsprogs/tests/f_overfsblks/ |
| expect.1 | 4 Group 0's inode bitmap at 3 conflicts with some other fs block.
|
| /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:
|
| /frameworks/webview/chromium/tools/ |
| merge_common.py | 133 """Checks for conflicts and commits once they are resolved.
135 Certain conflicts are resolved automatically; if any remain, the user is
140 unattended: If running unattended, abort on conflicts.
143 TemporaryMergeError: If there are conflicts in unattended mode.
167 conflicts = re.findall(r'^((DD|AU|UD|UA|DU|AA|UU) [^\n]+)$', status,
169 if not conflicts:
173 raise TemporaryMergeError('Cannot resolve merge conflicts.')
174 conflicts_string = '\n'.join([x[0] for x in conflicts])
176 ('The following conflicts exist and must be resolved.\n\n%s\n\nWhen '
|
| /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...] |
| conflicts.h | 1 /* Find and resolve or report lookahead conflicts for bison,
44 /* Were there 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
|
| /external/bison/po/ |
| POTFILES.in | 2 src/conflicts.c
|
| /external/chromium/net/base/ |
| network_change_notifier_netlink_linux.h | 6 // header contains a struct net; which conflicts with the net namespace. So we
|
| /external/chromium_org/chrome/browser/chromeos/drive/ |
| logging.h | 13 // Originally wanted to use 'logging' here, but it conflicts with
|
| /external/chromium_org/chrome/browser/sync_file_system/ |
| logger.h | 16 // Originally wanted to use 'logging' here, but it conflicts with
|
| /external/chromium_org/sync/engine/ |
| conflict_util.h | 5 // Utility functions that act on syncable::MutableEntry to resolve conflicts.
|
| /external/chromium_org/third_party/WebKit/Tools/Scripts/webkitpy/common/checkout/ |
| checkout.py | 72 conflicts = self._scm.conflicted_files()
73 if len(conflicts):
74 raise ScriptError(message="Failed to apply reverse diff for revision %s because of the following conflicts:\n%s" % (revision, "\n".join(conflicts)))
|
| /external/chromium_org/third_party/libjpeg/ |
| README.chromium | 22 avoid conflicts that arise when system libraries attempt to use our libjpeg.
|
| /external/chromium_org/ui/views/widget/desktop_aura/ |
| x11_whole_screen_move_loop_delegate.h | 9 // Get rid of a macro from Xlib.h that conflicts with Aura's RootWindow class.
|
| /external/openfst/src/lib/ |
| symbol-table-ops.cc | 50 vector<string> conflicts; local
65 conflicts.push_back(riter.Symbol());
79 for (int i= 0; i < conflicts.size(); ++i) {
80 merged->AddSymbol(conflicts[i]);
|
| /external/wpa_supplicant_8/src/drivers/ |
| linux_wext.h | 15 * Avoid including other kernel header to avoid conflicts with C library
|
| /frameworks/base/core/java/android/ |
| package.html | 10 may change between platform versions, causing unforeseen conflicts with your design. Typically,
|
| /external/stlport/stlport/stl/ |
| _abbrevs.h | 24 // ugliness is intentional - to reduce conflicts
43 // ugliness is intentional - to reduce conflicts probability
|
