Delta Between Two Patch Sets: libadblockplus-android/jni/Utils.h
Issue 29347315:
Issue 4231 - Fix unstable FilterEngineTest.testSetRemoveFilterChangeCallback (Closed)
Left Patch Set: fix for firstRun test
Created July 12, 2016, 1:05 p.m.
Right Patch Set: made helper methods static, fixed 'remove' for fs callback
Created Dec. 13, 2016, 9:32 a.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« libadblockplus-android-tests/src/org/adblockplus/libadblockplus/tests/FilterEngineGenericTest.java ('K')
|
« libadblockplus-android/jni/JniJsEngine.cpp ('k')
|
libadblockplus-android/jni/Utils.cpp » ('j')
|
libadblockplus-android/src/org/adblockplus/android/AndroidFileSystem.java » ('J')
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')
| LEFT | RIGHT |
|---|---|
| (no file at all) | |
| 1 /* | 1 /* |
| 2 * This file is part of Adblock Plus <https://adblockplus.org/>, | 2 * This file is part of Adblock Plus <https://adblockplus.org/>, |
| 3 * Copyright (C) 2006-2016 Eyeo GmbH | 3 * Copyright (C) 2006-2016 Eyeo GmbH |
| 4 * | 4 * |
| 5 * Adblock Plus is free software: you can redistribute it and/or modify | 5 * Adblock Plus is free software: you can redistribute it and/or modify |
| 6 * it under the terms of the GNU General Public License version 3 as | 6 * it under the terms of the GNU General Public License version 3 as |
| 7 * published by the Free Software Foundation. | 7 * published by the Free Software Foundation. |
| 8 * | 8 * |
| 9 * Adblock Plus is distributed in the hope that it will be useful, | 9 * Adblock Plus is distributed in the hope that it will be useful, |
| 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| (...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 196 { \ | 196 { \ |
| 197 JniThrowException(jEnv, except); \ | 197 JniThrowException(jEnv, except); \ |
| 198 return retVal; \ | 198 return retVal; \ |
| 199 } \ | 199 } \ |
| 200 catch (...) \ | 200 catch (...) \ |
| 201 { \ | 201 { \ |
| 202 JniThrowException(jEnv); \ | 202 JniThrowException(jEnv); \ |
| 203 return retVal; \ | 203 return retVal; \ |
| 204 } | 204 } |
| 205 | 205 |
| 206 std::string JniStdStreamToStdString(std::istream *in); | |
| 207 | |
| 206 #endif | 208 #endif |
| LEFT | RIGHT |
« libadblockplus-android/jni/JniJsEngine.cpp ('k')
|
libadblockplus-android/jni/Utils.cpp » ('j')
|
Toggle Intra-line Diffs ('i')
|
Expand Comments ('e')
|
Collapse Comments ('c')
|
Toggle Comments ('s')
