conflict_resolution
stringlengths
27
16k
<<<<<<< public static class IndexQueryHelpers { public static IndexQuery FromQueryString(string queryString) { var fields = queryString.Split(new[] { '&' }, StringSplitOptions.RemoveEmptyEntries) .Select(segment => { var parts = segment.Split(new[] { '=' }, StringSplitOptions.RemoveEmptyEntr...
<<<<<<< private Etag HandleDocumentIndexing(IList<IndexToWorkOn> indexesToWorkOn, List<JsonDocument> jsonDocs) ======= private Guid DoActualIndexing(IList<IndexToWorkOn> indexesToWorkOn, List<JsonDocument> jsonDocs) >>>>>>> private Etag DoActualIndexing(IList<IndexToWorkOn> indexesToWorkOn, List<JsonDocument> ...
<<<<<<< this.HighlightedFields.ApplyIfNotNull(field => path.Append("&highlight=").Append(field)); this.HighlighterPreTags.ApplyIfNotNull(tag=>path.Append("&preTags=").Append(tag)); this.HighlighterPostTags.ApplyIfNotNull(tag=>path.Append("&postTags=").Append(tag)); var vars = GetCusto...
<<<<<<< public abstract class AbstractIndexCreationTask : AbstractCommonApiForIndexesAndTransformers ======= #endif public abstract class AbstractIndexCreationTask >>>>>>> #endif public abstract class AbstractIndexCreationTask : AbstractCommonApiForIndexesAndTransformers
<<<<<<< JObject meta; JObject jsonData; ======= RavenJObject meta = null; RavenJObject jsonData = null; >>>>>>> RavenJObject meta = null; RavenJObject jsonData = null; <<<<<<< private JsonDocument[] DirectStartsWith(st...
<<<<<<< using Raven.Abstractions.Data; using Raven.Abstractions.Util; ======= using Raven.Abstractions.Util; using Raven.Database.Extensions; using Raven.Database.Impl; >>>>>>> using Raven.Abstractions.Util; using Raven.Abstractions.Data; using Raven.Abstractions.Util; <<<<<<< public IEnumerable<ListItem> Read(st...
<<<<<<< using Raven.Database.Indexing; using System.Linq; ======= using System.Linq; >>>>>>> using System.Linq; using System.Linq;
<<<<<<< /* * User: scorder */ using System; using System.IO; using System.Text; using MongoDB.Driver.Bson; namespace MongoDB.Driver.IO { /// <summary> /// Description of GetMoreMessage. /// </summary> public class GetMoreMessage : RequestMessage { // struct { // MsgHeader header; ...
<<<<<<< if (properties == null) { properties = TypeDescriptor.GetProperties(doc); } var abstractFields = anonymousObjectToLuceneDocumentConverter.Index(doc, properties, Field.Store.NO).ToList(); ======= var properties = TypeDescriptor.GetProperties(doc); var abstractFields = anonymousObje...
<<<<<<< var doc = new RavenJObject(DataAsJson); //clone the document var metadata = new RavenJObject(Metadata); // clone the metadata metadata["Last-Modified"] = RavenJToken.FromObject(LastModified.ToString("r")); metadata["@etag"] = Etag.ToString(); doc["@metadata"] = metadata; metadata["Non-Authorit...
<<<<<<< var multiLoadResult = DatabaseCommands.Get(ids, new string[] {}, transformer, queryInputs); return new LoadTransformerOperation(this, transformer, ids.Length).Complete<T>(multiLoadResult); } internal object ProjectionToInstance(RavenJObject y, Type type) { HandleInternalMetadata(y); foreach (...
<<<<<<< public static int MaximumMessageSize = 1024 * 1024 * 4; public MessageHeader Header { get; set; } ======= public MessageHeader Header { get; protected set; } >>>>>>> public static int MaximumMessageSize = 1024 * 1024 * 4; public MessageHeader Header { get; pro...
<<<<<<< using System; using System.Collections.Generic; ======= using System.Collections; using System.Collections.Generic; >>>>>>> using System.Collections; using System.Collections.Generic; <<<<<<< using System.Security.Cryptography; ======= using Lucene.Net.Analysis; >>>>>>> using System.Security.Cryptography...
<<<<<<< using System; using System.Collections.Generic; using System.IO; using System.Linq; using Raven.Imports.Newtonsoft.Json; namespace Raven.Munin.Tests { public class ToDoRepository { readonly Database database; private Table todos; public ToDoRepository(IPersistentSource source) { database = new D...
<<<<<<< private const string IndexVersion = "1.2.17"; ======= private readonly DocumentDatabase documentDatabase; >>>>>>> private readonly DocumentDatabase documentDatabase; private const string IndexVersion = "1.2.17";
<<<<<<< using System.Linq; ======= using Raven.Database.Indexing; >>>>>>> using System.Linq; using Raven.Database.Indexing; <<<<<<< var result = databaseCommands.Query(indexName, query, start, pageSize, projectionFields); ======= var result = databaseCommands.Query(indexName, new IndexQuery(query, start, ...
<<<<<<< #if !SILVERLIGHT && !NETFX_CORE MaxNumberOfCachedRequests = 2048; ======= #if !SILVERLIGHT >>>>>>> #if !SILVERLIGHT && !NETFX_CORE <<<<<<< #if !SILVERLIGHT && !NETFX_CORE jsonRequestFactory = new HttpJsonRequestFactory(MaxNumberOfCachedRequests); #else jsonRequestFactory = new HttpJsonRequestFactor...
<<<<<<< var databaseAccess = tokenBody.AuthorizedDatabases.FirstOrDefault(x=>string.Equals(x.TenantId, tenantId, StringComparison.OrdinalIgnoreCase) || x.TenantId == "*"); if (databaseAccess == null) return false; ======= var databaseAccess = tokenBody.AuthorizedDatabases .Where(x=> string.Equa...
<<<<<<< /* * User: scorder * Date: 7/8/2009 */ using System; using System.Collections.Generic; using MongoDB.Driver.Bson; using MongoDB.Driver.IO; namespace MongoDB.Driver { /// <summary> /// Description of Collection. /// </summary> public class Collection { private Connection connection; private stri...
<<<<<<< public void PrepareForLongRequest() { Timeout = TimeSpan.FromHours(6); webRequest.AllowWriteStreamBuffering = false; } public Task<Stream> GetRawRequestStream() { return Task.Factory.FromAsync<Stream>(webRequest.BeginGetRequestStream, webRequest.EndGetRequestStream, null); } public Tas...
<<<<<<< Assert.NotEmpty(accessor.Lists.Read(Constants.RavenReplicationDocsTombstones, Etag.Empty, 10)); ======= Assert.NotEmpty(accessor.Lists.Read(Constants.RavenReplicationDocsTombstones, Guid.Empty, null, 10)); >>>>>>> Assert.NotEmpty(accessor.Lists.Read(Constants.RavenReplicationDocsTombstones, Et...
<<<<<<< dataSection = new DocumentSection{ Name = "Data", Document = new EditorDocument { Language = JsonLanguage, TabSize = 2 } }; metaDataSection = new DocumentSection{ Name = "Metadata", Document = new EditorDocument { Language = JsonLanguage, TabSize = 2 } }; DocumentSections = new List<DocumentSection> {...
<<<<<<< ======= using Raven.Imports.Newtonsoft.Json; using Raven.Imports.Newtonsoft.Json.Linq; >>>>>>> <<<<<<< var includeCmd = new AddIncludesCommand(database, TransactionInformation, (etag, doc) => multiLoadResult.Includes.Add(doc), includes, new HashSet<string>(ids...
<<<<<<< const int Input1SlotId = 0; const int Input2SlotId = 1; const int OutputSlotId = 2; const string kInput1SlotName = "A"; const string kInput2SlotName = "B"; const string kOutputSlotName = "Out"; public enum MultiplyType ======= public override st...
<<<<<<< using System; namespace Raven.Bundles.UniqueConstraints { using System.Linq; using System.Text; using Abstractions.Data; using Database.Plugins; using Json.Linq; using Raven.Database.Extensions; public class UniqueConstraintsPutTrigger : AbstractPutTrigger { public override void AfterPut(string ke...
<<<<<<< RemoveReservedProperties(metadata); Etag newEtag = Etag.Empty; ======= RemoveMetadataReservedProperties(metadata); Guid newEtag = Guid.Empty; >>>>>>> RemoveMetadataReservedProperties(metadata); Etag newEtag = Etag.Empty;
<<<<<<< JToken value; ======= if (ReplicationContext.IsInReplicationContext) return ReadVetoResult.Allowed; RavenJToken value; >>>>>>> RavenJToken value;
<<<<<<< var value = StripQuotesIfNeeded(header.Value.ToString(Formatting.None)); switch (header.Name) { case "Content-Type": context.Response.ContentType = value; break; default: context.Response.AddHeader(header.Name, value); break; } } if (headers["@Http-Status...
<<<<<<< using System.Threading.Tasks; using Raven.Client.Document; ======= using Raven.Client.Extensions; >>>>>>> using Raven.Client.Document; using Raven.Client.Extensions; using Raven.Client.Extensions; using System.Threading.Tasks; using Raven.Client.Document; <<<<<<< using (GetNewServer()) using (var stor...
<<<<<<< var ravenQueryProvider = new RavenQueryProviderProcessor<T>(provider.QueryGenerator, null, null, null); var luceneQuery = ravenQueryProvider.GetLuceneQueryFor(expression); ======= var ravenQueryProvider = new RavenQueryProviderProcessor<T>(provider.QueryGenerator, null, null, null, new HashSet<string...
<<<<<<< /// <summary> /// Order the results by the specified fields /// </summary> /// <remarks> /// The fields are the names of the fields to sort, defaulting to sorting by ascending. /// You can prefix a field name with '-' to indicate sorting by descending or '+' to sort by ascending /// </remarks> /...
<<<<<<< private readonly Dictionary<long, JournalFile.PagePosition> _transactionPageTranslation = new Dictionary<long, JournalFile.PagePosition>(); private ImmutableAppendOnlyList<KeyValuePair<long, long>> _transactionEndPositions = ImmutableAppendOnlyList<KeyValuePair<long, long>>.Empty; ======= private int _r...
<<<<<<< if (GenerateEntityIdOnTheClient.TryGetIdFromDynamic(entity, out id)) return id; var key = await GenerateKeyAsync(entity); // If we generated a new id, store it back into the Id field so the client has access to to it if (key != null) GenerateEntityIdOnTheClient.Try...
<<<<<<< ReduceKeyCounts = new Table(Tables.ReduceKeyCounts.TableName, Tables.ReduceKeyCounts.Indices.ByView); ReduceKeyTypes = new Table(Tables.ReduceKeyTypes.TableName, Tables.ReduceKeyTypes.Indices.ByView); Attachments = new Table(Tables.Attachments.TableName); ReduceResults = new Table(Tables.ReduceResul...
<<<<<<< using Raven.Abstractions.Data; ======= using Raven.Abstractions.Connection; >>>>>>> using Raven.Abstractions.Connection; using Raven.Abstractions.Data;
<<<<<<< IEnumerable<MappedResultInfo> GetMappedResults(string indexName, string[] keysToReduce, bool loadData); IEnumerable<ReduceTypePerKey> GetReduceKeysAndTypes(string view, int start, int take); ======= IEnumerable<MappedResultInfo> GetMappedResults(string indexName, IEnumerable<string> keysToReduce, bool l...
<<<<<<< public IEnumerable<ReduceTypePerKey> GetReduceKeysAndTypes(string view, int start, int take) { return storage.ReduceKeys["ByView"].SkipTo(new RavenJObject { { "view", view } }) .TakeWhile(x => StringComparer.InvariantCultureIgnoreCase.Equals(x.Value<string>("view"), view)) .Skip(start) .Take(...
<<<<<<< [Test] public void TestToByteArray(){ byte[] bytes = new byte[]{1,2,3,4,5,6,7,8,9,10,11,12}; string hex = "0102030405060708090a0b0c"; Oid bval = new Oid(bytes); byte[] bytes2 = bval.ToByteArray(); Assert.IsNotNull...
<<<<<<< id = GenerateKey(entity); ======= id = Conventions.DocumentKeyGenerator(entity); // If we generated a new id, store it back into the Id field so the client has access to to it >>>>>>> id = GenerateKey(entity); // If we generated a new id, store it back into the Id...
<<<<<<< // yeah, we found a line, let us give it to the users var oldStartPos = startPos; startPos = i + 1; // is it an empty line? if (oldStartPos == i - 2) { continue; // ig...
<<<<<<< //----------------------------------------------------------------------- // <copyright file="PendingTransactionRecovery.cs" company="Hibernating Rhinos LTD"> // Copyright (c) Hibernating Rhinos LTD. All rights reserved. // </copyright> //---------------------------------------------------------------------...
<<<<<<< using System.Threading; using System.Threading.Tasks; ======= using System.Collections.Generic; using System.Linq; >>>>>>> using System.Collections.Generic; using System.Linq; <<<<<<< using Raven.Database.Extensions; ======= using Raven.Client.Extensions; using Raven.Client.Shard; >>>>>>> using Raven.Cli...
<<<<<<< using System; using System.Collections; using System.Collections.Generic; using System.IO; using System.Reflection; ======= using System; using System.IO; >>>>>>> using System; using System.Collections; using System.Collections.Generic; using System.IO;
<<<<<<< var bwriter = new BsonWriter(bstream); Header.MessageLength += CalculateBodySize(bwriter); ======= var bwriter = new BsonWriter(bstream,new ReflectionDescriptor()); Header.MessageLength += this.CalculateBodySize(bwriter); if(Header.Mes...
<<<<<<< using Newtonsoft.Json.Linq; using Raven.Abstractions.MEF; ======= using Raven.Json.Linq; >>>>>>> using Raven.Json.Linq; using Raven.Abstractions.MEF;
<<<<<<< var genericEnumerable = typeof(IEnumerable<>).MakeGenericType(child.AsType()); ======= if (child.IsGenericTypeDefinition) continue; var genericEnumerable = typeof(IEnumerable<>).MakeGenericType(child); >>>>>>> if (child.IsGenericTypeDefinition) continue; var genericEnumerable =...
<<<<<<< #if SILVERLIGHT /// <summary> /// Get the low level bulk insert operation /// </summary> public ILowLevelBulkInsertOperation GetBulkInsertOperation(BulkInsertOptions options) { return new RemoteBulkInsertOperation(options, this); } #endif ======= public async Task<IAsyncEnumerator<RavenJObj...
<<<<<<< var request = jsonRequestFactory.CreateHttpJsonRequest(new CreateHttpJsonRequestParams(this, path.NoCache(), "GET", credentials, convention) ======= var request = jsonRequestFactory.CreateHttpJsonRequest( new CreateHttpJsonRequestParams(this, path.NoCache(), "GET", creden...
<<<<<<< ======= UseSsl = new BooleanSetting(settings["Raven/UseSsl"], false); >>>>>>> UseSsl = new BooleanSetting(settings["Raven/UseSsl"], false); <<<<<<< ======= public BooleanSetting UseSsl { get; private set; } >>>>>>> public BooleanSetting UseSsl { get; private set; } public StringSe...
<<<<<<< var result = session.Advanced.LuceneQuery<EntityCount>("someIndex") ======= var result = session.LuceneQuery<EntityCount>("someIndex").WaitForNonStaleResults() >>>>>>> var result = session.Advanced.LuceneQuery<EntityCount>("someIndex") var resul...
<<<<<<< var existingIndex = IndexDefinitionStorage.GetIndexDefinition(name); ======= var fixedName = IndexDefinitionStorage.FixupIndexName(name); var existingIndex = IndexDefinitionStorage.GetIndexDefinition(fixedName); >>>>>>> var fixedName = IndexDefinitionStorage.FixupIndexName(name); ...
<<<<<<< public void Write (Stream stream){ MessageHeader header = this.Header; BufferedStream bstream = new BufferedStream(stream); BinaryWriter writer = new BinaryWriter(bstream); BsonWriter bwriter = new BsonWriter(bstream); Header.Messa...
<<<<<<< #if !SILVERLIGHT && !NETFX_CORE public Action<HttpWebRequest> DoOAuthRequest(string oauthSource) ======= #if !SILVERLIGHT public override Action<HttpWebRequest> DoOAuthRequest(string oauthSource) >>>>>>> #if !SILVERLIGHT && !NETFX_CORE public override Action<HttpWebRequest> DoOAuthRequest(string oauthS...
<<<<<<< using Raven.Abstractions.Data; ======= using Raven.Database.Indexing; >>>>>>> using Raven.Database.Indexing; using Raven.Abstractions.Data;
<<<<<<< commpressedData.Flush(); ======= return stream.CanSeek ? stream.Length : 0; >>>>>>> commpressedData.Flush(); return stream.CanSeek ? stream.Length : 0;
<<<<<<< LastIndexedEtag = Etag.Parse(readResult.Key.Value<byte[]>("lastEtag")), ======= LastIndexedEtag = new Guid(readResult.Key.Value<byte[]>("lastEtag")), Priority = (IndexingPriority)readResult.Key.Value<int>("priority"), >>>>>>> Priority = (IndexingPriority)readResult.Key...
<<<<<<< TimeEntryView Patch(TimeEntryTime timeEntryData); void Delete(int timeEntryId); ======= void Delete(int timeEntryId, string userName); >>>>>>> void Delete(int timeEntryId);
<<<<<<< var parameters = new MoreLikeThisQueryParameters { DocumentId = match.Groups[2].Value, Fields = context.Request.QueryString.GetValues("fields"), Boost = GetNullableBool(context.Request.QueryString.Get("boost")), MaximumNumberOfTokensParsed = GetNullableInt(co...
<<<<<<< private readonly DatabaseEtagSynchronizer etagSynchronizer; public DatabaseEtagSynchronizer EtagSynchronizer { get { return etagSynchronizer; } } ======= private readonly DatabaseEtagSynchronizer etagSynchronizer; public DatabaseEtagSynchronizer EtagSynchronizer ...
<<<<<<< using Raven.Client.Embedded; using Raven.Client.Listeners; ======= using Raven.Client.Listeners; >>>>>>> using Raven.Client.Embedded; using Raven.Client.Listeners; <<<<<<< protected void WaitForReplication(IDocumentStore store, Func<IDocumentSession, bool> predicate, string db = null) { for (int i ...
<<<<<<< public bool Authorize(IHttpContext ctx, bool hasApiKey, bool ignoreDb) ======= public bool Authorize(IHttpContext ctx, bool hasApiKey, bool ignoreDbAccess) >>>>>>> public bool Authorize(IHttpContext ctx, bool hasApiKey, bool ignoreDbAccess) <<<<<<< if (allowUnauthenticatedUsers || ignoreDb) =====...
<<<<<<< storage.Batch(accessor => accessor.Indexing.DeleteIndex(a, new CancellationToken())); ======= storage.Batch(accessor => accessor.Indexing.DeleteIndex("a", new CancellationToken())); >>>>>>> storage.Batch(accessor => accessor.Indexing.DeleteIndex(a, new CancellationToken())...
<<<<<<< #if !NET35 , SetupCommandsAsync(AsyncDatabaseCommands, options.Database, options.Credentials) ======= #if !NET_3_5 , SetupCommandsAsync(AsyncDatabaseCommands, options.Database, options.Credentials, options) >>>>>>> #if !NET35 , SetupCommandsAsync(AsyncDatabaseCommands, options.Database, options.Credentials, ...
<<<<<<< var result = await CreateReportFileByteUpdateFileNameContentTypeAsync(emailData, groupedList); ======= var fileByte = CreateReportFileByteUpdateFileNameContentType(emailData, groupedList); >>>>>>> var fileByte = await CreateReportFileByteUpdateFileNameContentTypeAsync(emai...
<<<<<<< ======= using System; using System.Collections.Generic; >>>>>>> using System.Collections.Generic;
<<<<<<< if (string.Equals(index, indexFromDb, StringComparison.OrdinalIgnoreCase) == false) ======= if (string.Equals(getItemsToReduceParams.Index, indexFromDb, StringComparison.InvariantCultureIgnoreCase) == false) >>>>>>> if (string.Equals(getItemsToReduceParams.Index, indexFromDb, StringComparison....
<<<<<<< MailCost, ResizeInventory, ======= MailCost, NewIntelligentCreature, UpdateIntelligentCreatureList, IntelligentCreatureEnableRename >>>>>>> MailCost, ResizeInventory, NewIntelligentCreature, UpdateIntelligentCreatureList, IntelligentCreatureEnableRename <<<<<<< case...
<<<<<<< RemovePet, ConquestGuard, ConquestGate, ConquestWall, ConquestSiege, TakeConquestGold, SetConquestRate, StartConquest, ScheduleConquest, OpenGate, CloseGate, ======= RemovePet, Break >>>>>>> Remove...
<<<<<<< case (short)ServerPacketIds.GuildBuffList: GuildBuffList((S.GuildBuffList)p); break; ======= case (short)ServerPacketIds.LoverUpdate: LoverUpdate((S.LoverUpdate)p); break; case (shor...
<<<<<<< this.Category_textbox.Location = new System.Drawing.Point(86, 155); this.Category_textbox.MaxLength = 0; this.Category_textbox.Name = "Category_textbox"; this.Category_textbox.Size = new System.Drawing.Size(173, 20); this.Category_textbox.TabIndex = 10...
<<<<<<< GuildBuff, ======= RelationshipEXP, Mentee, Mentor, >>>>>>> RelationshipEXP, Mentee, Mentor, GuildBuff, <<<<<<< FriendUpdate, GuildBuffList ======= FriendUpdate, LoverUpdate, MentorUpdate, >>>>>>> FriendUpdate, LoverUpdate, MentorUpdate, ...
<<<<<<< case (short)ClientPacketIds.GameshopBuy: GameshopBuy((C.GameshopBuy)p); return; ======= case (short)ClientPacketIds.NPCConfirmInput: NPCConfirmInput((C.NPCConfirmInput)p); break; >>>>>>> ...
<<<<<<< case 71://Sabuk Archer return new ConquestArcher(info); case 72: return new Gate(info); case 73: return new Wall(info); ======= >>>>>>> case 71: return new SabukGate...
<<<<<<< NPCs = new MLibrary[200], Mounts = new MLibrary[16], Fishing = new MLibrary[2]; ======= NPCs = new MLibrary[186], ...
<<<<<<< try { info.UsedFilesInOlderGenerations = usedFileIds.Select(fi => GetGeneration(fi)) .Where(gen => gen < trlGeneration).OrderBy(a => a).ToArray(); } catch (ArgumentOutOfRangeException) { ...
<<<<<<< _stream = new FileStream(fileName, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None, 1, FileOptions.None); ======= _stream = new FileStream(fileName, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None, 1, FileOptions.None); _handle = _str...
<<<<<<< BuildSelect(sb, GetScaffoldableProperties((T)Activator.CreateInstance(typeof(T))).ToArray()); sb.AppendFormat(" from {0} where ", name); for (var i = 0; i < idProps.Count; i++) { if (i > 0) sb.Append(" and "); s...
<<<<<<< using White.Core; using White.Core.Testing; using White.Core.UIItems; ======= using White.Core; using White.Core.UIItems; using White.UnitTests.Core.Testing; >>>>>>> using White.Core; using White.Core.Testing; using White.Core.UIItems; using White.UnitTests.Core.Testing;
<<<<<<< using TestStack.White.UIA; using TestStack.White.UIItems.Actions; ======= using White.Core.UIA; using White.Core.UIItems.Actions; using White.Core.WindowsAPI; >>>>>>> using TestStack.White.UIA; using TestStack.White.UIItems.Actions; using White.Core.WindowsAPI;
<<<<<<< ======= if (_exceptionContext.Result == null) { _exceptionContext.Result = new EmptyResult(); } Task task; >>>>>>> if (_exceptionContext.Result == null) ...
<<<<<<< [Fact] public async Task RazorPage_WithLinks_GeneratesLinksCorrectly() { // Arrange & Act var response = await Client.GetAsync("http://localhost/PageWithLinks"); // Assert Assert.Equal(HttpStatusCode.OK, response.StatusCode); ...
<<<<<<< ======= /// Converts a <see cref="Color" /> struct to a <see cref="System.Drawing.Color" /> struct. /// </summary> /// <param name="color">The <see cref="Color" /> to convert.</param> /// <returns> /// An instance of <see cref="System.Drawing.Color" /> representing the ...
<<<<<<< ======= [Test] public void ShouldConvertFromSystemColor() { var source = SystemColor.FromArgb(5, 10, 15, 20); var coloreColor = Color.FromSystemColor(source); Assert.AreEqual(source.R, coloreColor.R); Assert.AreEqual(source.G, coloreCol...
<<<<<<< [DllImport(CvInvoke.ExternLibrary, CallingConvention = CvInvoke.CvCallingConvention)] internal extern static IntPtr cvSoftCascadeDetectorCreate( ======= [DllImport(CvInvoke.EXTERN_LIBRARY, CallingConvention = CvInvoke.CvCallingConvention)] internal extern static IntPtr cveSoftCascadeDe...
<<<<<<< using System.Threading; ======= using System.Linq; >>>>>>> using System.Threading; using System.Linq;
<<<<<<< ======= public SubFingerprintData AddHashedFingerprint(HashedFingerprint hashedFingerprint, IModelReference trackReference) { var subFingerprintReference = subFingerprintReferenceProvider.Next(); var subFingerprintData = new SubFingerprintData( hashedFin...
<<<<<<< if (!_toxAv.IsInvalid && !_toxAv.IsClosed && _toxAv != null) ======= ClearEventSubscriptions(); if (_toxAv != null && !_toxAv.IsInvalid && !_toxAv.IsClosed) >>>>>>> if (_toxAv != null && !_toxAv.IsInvalid && !_toxAv.IsClosed)
<<<<<<< _log.WriteLine("Creating write tasks"); var tasks = writers.Select( (writer, index) => Task.Run( ======= var writerTasks = writers.Select( (writer, idx) => Task.Run( >>>>>>> _log.WriteLine("Creating write tasks"); ...
<<<<<<< for (var i = 0; i < 10000; i++) ======= for (var i = 0; i < 10000; i++) >>>>>>> for (var i = 0; i < 10000; i++) <<<<<<< writer.Dispose(); while (records.Count < 5) Thread.Sleep(0); sub.Dispose(); Assert.Equal(5, records.C...
<<<<<<< public Configuration SetOutputFormatter(IOutputFormatter formatter) { if (formatter == null) throw new ArgumentNullException("formatter"); OutputFormatter = formatter; return this; } readonly List<IValueConverter> valueConverter...
<<<<<<< [TestFixture] class StatePrinterTest { [Test] public void Instantiate() { Assert.Throws<ArgumentNullException>(() => new Stateprinter(null)); Assert.Throws<ArgumentNullException>(() => new StatePrinter(null)); } } [SetCu...
<<<<<<< private GUISkin skin; private Color nodeColor; private Color lineColor; private Texture2D nodeTexture; private Texture2D lineTexture; private Rect headerSection; private Rect portSection; private Rect bodySection; private Rect subBodySec...
<<<<<<< public IReadOnlyList<Target> EntryPointTargets { get; } public ConcurrentBag<Target> OrderedTargets { get; } public ProjectNode_BeforeThis Node_BeforeThis { get; } public override Component Parent => ParentBuild; ======= public IReadOnlyList<Target> EntryPointTargets =>...
<<<<<<< // Copyright (c) Sayed Ibrahim Hashimi. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.md in the project root for license information. using System; using System.Collections.Generic; using System.IO; using System.Linq; using System.Text.RegularExpressions; using System.Xml...
<<<<<<< /// <summary> /// Model code /// </summary> public const string ModelCodeKey = "ModelCode"; /// <summary> /// Model code /// </summary> public static string ModelCode => GetString(ModelCodeKey); /// <summary> /// Expression '{0}' do not contains any security identifiers. Format should be ...
<<<<<<< /// <summary> /// Volume at open /// </summary> public const string OpenVolumeKey = nameof(OpenVolume); /// <summary> /// Volume at open /// </summary> public static string OpenVolume => GetString(OpenVolumeKey); /// <summary> /// Volume at close /// </summary> public const string Clo...
<<<<<<< #endregion protected override IEnumerable<RarReaderEntry> GetEntries(Stream stream) ======= internal override IEnumerable<RarReaderEntry> GetEntries(Stream stream) >>>>>>> protected override IEnumerable<RarReaderEntry> GetEntries(Stream stream)
<<<<<<< private readonly Stream stream; private readonly CountingWritableSubStream rawStream; private bool disposed; private bool finished; ======= private readonly Stream _stream; private readonly CountingWritableSubStream _countingWritableSubStream; private bo...
<<<<<<< public virtual string UniqueId { get { return TrackInformation.FullName; } } private string _FileHash; ======= private string _fileHash; >>>>>>> public virtual string UniqueId { get { return TrackInformation.FullName; } ...
<<<<<<< /// Looks up a localized string similar to 邮箱. ======= /// 查找类似 效果 的本地化字符串。 /// </summary> public static string Effects { get { return ResourceManager.GetString("Effects", resourceCulture); } } /// <summary> ...