Side by Side Diff: src/engine/Main.cpp
Issue 6216090891845632:
Issue #404 - Create common library shared between plugin/engine and installer (Closed)
Patch Set:
Created Jan. 9, 2015, 8:07 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« common/common.gypi ('K')
|
« common/test/RegistryTest.cpp ('k')
|
src/plugin/PluginClass.cpp » ('j')
|
no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| OLD | NEW |
|---|---|
| 1 #include <AdblockPlus.h> | 1 #include <AdblockPlus.h> |
| 2 #include <functional> | 2 #include <functional> |
| 3 #include <vector> | 3 #include <vector> |
| 4 #include <thread> | 4 #include <thread> |
| 5 #include <Windows.h> | 5 #include <Windows.h> |
| 6 | 6 |
| 7 #include "../shared/AutoHandle.h" | 7 #include "../shared/AutoHandle.h" |
| 8 #include "../shared/Communication.h" | 8 #include "../shared/Communication.h" |
| 9 #include "../shared/Dictionary.h" | 9 #include "../shared/Dictionary.h" |
| 10 #include "../shared/Utils.h" | 10 #include "../shared/Utils.h" |
| 11 #include "../shared/Version.h" | 11 #include "../shared/Version.h" |
| 12 #include "../shared/CriticalSection.h" | 12 #include "../shared/CriticalSection.h" |
| 13 #include "../shared/IE_version.h" | 13 #include "IE_Version.h" |
| 14 #include "AdblockPlus.h" | 14 #include "AdblockPlus.h" |
| 15 #include "Debug.h" | 15 #include "Debug.h" |
| 16 #include "Updater.h" | 16 #include "Updater.h" |
| 17 | 17 |
| 18 namespace | 18 namespace |
| 19 { | 19 { |
| 20 std::auto_ptr<AdblockPlus::FilterEngine> filterEngine; | 20 std::auto_ptr<AdblockPlus::FilterEngine> filterEngine; |
| 21 std::auto_ptr<Updater> updater; | 21 std::auto_ptr<Updater> updater; |
| 22 int activeConnections = 0; | 22 int activeConnections = 0; |
| 23 CriticalSection activeConnectionsLock; | 23 CriticalSection activeConnectionsLock; |
| (...skipping 461 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 485 } | 485 } |
| 486 catch (const std::runtime_error& e) | 486 catch (const std::runtime_error& e) |
| 487 { | 487 { |
| 488 DebugException(e); | 488 DebugException(e); |
| 489 return 1; | 489 return 1; |
| 490 } | 490 } |
| 491 } | 491 } |
| 492 | 492 |
| 493 return 0; | 493 return 0; |
| 494 } | 494 } |
| OLD | NEW |
« common/common.gypi ('K')
|
« common/test/RegistryTest.cpp ('k')
|
src/plugin/PluginClass.cpp » ('j')
|
no next file with comments »
