3
--- a/xbmc/settings/AdvancedSettings.h
+++ b/xbmc/settings/AdvancedSettings.h
@@ -337,6 +337,7 @@ class CAdvancedSettings : public ISettingCallback, public ISettingsHandler
int m_iSkipLoopFilter;
float m_ForcedSwapTime; /* if nonzero, set's the explicit time in ms to allocate for buffer swap */
+ bool m_myAMDGPUsucks;
bool m_AllowD3D9Ex;
bool m_ForceD3D9Ex;
bool m_AllowDynamicTextures;
87
--- a/main/src/cgeo/geocaching/apps/cache/navi/NavigationAppFactory.java
+++ b/main/src/cgeo/geocaching/apps/cache/navi/NavigationAppFactory.java
@@ -80,6 +80,9 @@ private NavigationAppFactory() {
this.app = app;
this.id = id;
this.preferenceKey = preferenceKey;
+ if (preferenceKey == 0 || preferenceKey == -1) {
+ throw new IllegalStateException("Every navigation app must have a boolean preference in the settings to be enabled/disabled.");
+ }
}
/**
3
--- a/wp-content/plugins/buddypress/bp-templates/bp-legacy/buddypress/members/index.php
+++ b/wp-content/plugins/buddypress/bp-templates/bp-legacy/buddypress/members/index.php
@@ -38,7 +38,7 @@
<option value="newest"><?php _e( 'Newest Registered', 'buddypress' ); ?></option>
<?php if ( bp_is_active( 'xprofile' ) ) : ?>
- <option value="alphabetical"><?php _e( 'Alphabetical', 'buddypress' ); ?></option>
+ <option value="alphabetical" selected="selected"><?php _e( 'Alphabetical', 'buddypress' ); ?></option>
<?php endif; ?>
<?php do_action( 'bp_members_directory_order_options' ); ?>
5087
--- a/test/ng/filter/limitToSpec.js
+++ b/test/ng/filter/limitToSpec.js
@@ -34,20 +34,30 @@ describe('Filter: limitTo', function() {
});
- it('should return an empty array when X cannot be parsed', function() {
- expect(limitTo(items, 'bogus')).toEqual([]);
- expect(limitTo(items, 'null')).toEqual([]);
- expect(limitTo(items, 'undefined')).toEqual([]);
- expect(limitTo(items, null)).toEqual([]);
- expect(limitTo(items, undefined)).toEqual([]);
+ it('should return an empty array when X = 0', function() {
+ expect(limitTo(items, 0)).toEqual([]);
+ expect(limitTo(items, '0')).toEqual([]);
});
- it('should return an empty string when X cannot be parsed', function() {
- expect(limitTo(str, 'bogus')).toEqual("");
- expect(limitTo(str, 'null')).toEqual("");
- expect(limitTo(str, 'undefined')).toEqual("");
- expect(limitTo(str, null)).toEqual("");
- expect(limitTo(str, undefined)).toEqual("");
+ it('should return entire array when X cannot be parsed', function() {
+ expect(limitTo(items, 'bogus')).toEqual(items);
+ expect(limitTo(items, 'null')).toEqual(items);
+ expect(limitTo(items, 'undefined')).toEqual(items);
+ expect(limitTo(items, null)).toEqual(items);
+ expect(limitTo(items, undefined)).toEqual(items);
+ });
+
+ it('should return an empty string when X = 0', function() {
+ expect(limitTo(str, 0)).toEqual("");
+ expect(limitTo(str, '0')).toEqual("");
+ });
+
+ it('should return entire string when X cannot be parsed', function() {
+ expect(limitTo(str, 'bogus')).toEqual(str);
+ expect(limitTo(str, 'null')).toEqual(str);
+ expect(limitTo(str, 'undefined')).toEqual(str);
+ expect(limitTo(str, null)).toEqual(str);
+ expect(limitTo(str, undefined)).toEqual(str);
});
7
--- a/esp/esp/users/models/__init__.py
+++ b/esp/esp/users/models/__init__.py
@@ -930,7 +930,6 @@ def program_schoolyear(program):
schoolyear = ESPUser.current_schoolyear(now)
schoolyear += program.incrementGrade() # adds 1 if appropriate tag is set; else does nothing
return schoolyear
- # The cache will need to be cleared once per academic year.
program_schoolyear.__func__.depend_on_row(lambda: Tag, lambda tag: {'program': tag.target})
@cache_function
@@ -958,6 +957,7 @@ def getGrade(self, program = None):
if yog is not None:
grade = ESPUser.gradeFromYOG(yog, schoolyear)
return grade
+ # The cache will need to be cleared once per academic year.
getGrade.get_or_create_token(('self',))
getGrade.get_or_create_token(('program',))
getGrade.depend_on_cache(getYOG, lambda self=wildcard, program=wildcard, **kwargs: {'self': self, 'program': program})
@@ -974,8 +974,9 @@ def gradeFromYOG(yog, schoolyear=None):
return schoolyear + 12 - yog
@staticmethod
- def YOGFromGrade(grade):
- schoolyear = ESPUser.current_schoolyear()
+ def YOGFromGrade(grade, schoolyear=None):
+ if schoolyear is None:
+ schoolyear = ESPUser.current_schoolyear()
try:
grade = int(grade)
except:
3
index 0000000..e36b451
--- /dev/null
+++ b/tests/test.js
@@ -0,0 +1,14 @@
+/**
+ * Created by Michael Lyons (mdl0394@gmail.com)
+ */
+
+(function() {
+ var chai = require( 'chai' ),
+ assert = chai.assert;
+
+ describe( 'Smoke test', function() {
+ it( 'Should true', function() {
+ assert( true );
+ } );
+ } );
+}) ();
\ No newline at end of file
34
--- a/example/example.cpp
+++ b/example/example.cpp
@@ -75,12 +75,12 @@ int main(int, char* [])
auto async_file= spd::daily_logger_st("async_file_logger", "logs/async_log.txt");
async_file->info() << "This is async log.." << "Should be very fast!";
-#ifdef __linux__
+ #ifdef __linux__
// syslog example
std::string ident = "spdlog-example";
auto syslog_logger = spd::syslog_logger("syslog", ident, LOG_PID);
syslog_logger->warn("This is warning that will end up in syslog. This is Linux only!");
-#endif
+ #endif
}
catch (const spd::spdlog_ex& ex)
3
--- a/SDKLauncher-Android/src/org/readium/sdk/android/launcher/WebViewActivity.java
+++ b/SDKLauncher-Android/src/org/readium/sdk/android/launcher/WebViewActivity.java
@@ -86,7 +86,7 @@
public class WebViewActivity extends FragmentActivity implements
ViewerSettingsDialog.OnViewerSettingsChange {
- private final boolean quiet = true;
+ private final boolean quiet = false;
private static final String TAG = "WebViewActivity";
private static final String ASSET_PREFIX = "file:///android_asset/readium-shared-js/";
3
--- a/test/blacksmith/ListTests.java
+++ b/test/blacksmith/ListTests.java
@@ -19,7 +19,7 @@ public void createsList() throws ReflectiveOperationException {
int size = 50;
ListBlueprint<Customer> blueprint = new ListBlueprint<Customer>(Customer.class, size);
- blueprint.addFieldStrategy("age", new IterationStrategy<Integer>(){
+ blueprint.add("age", new IterationStrategy<Integer>(){
@Override
public Integer get(Object previous, int iteration) {
int result = 1;
@@ -33,10 +33,10 @@ public Integer get(Object previous, int iteration) {
}
});
- blueprint.addFieldStrategy("customerId", new RandomUUIDStrategy());
+ blueprint.add("customerId", new RandomUUIDStrategy());
Blueprint<Subscription> subscriptionBlueprint = new Blueprint<Subscription>(Subscription.class);
subscriptionBlueprint.add("customerId", new RandomUUIDStrategy());
- blueprint.addFieldStrategy("subscription", subscriptionBlueprint);
+ blueprint.add("subscription", subscriptionBlueprint);
List<Customer> customers = blueprint.get();
5
--- a/lib/rom/rails/configuration.rb
+++ b/lib/rom/rails/configuration.rb
@@ -19,10 +19,16 @@ def self.rewrite_config(root, config)
username = config[:username]
hostname = config.fetch(:hostname) { 'localhost' }
- adapter = "sqlite" if adapter == "sqlite3"
+ adapter = 'sqlite' if adapter == 'sqlite3'
+
+ # FIXME: config parsing should be sent through adapters
+ # rom-rails shouldn't refer directly to any adapter constants
+ if defined?(ROM::SQL) && ROM::SQL::Adapter.schemes.include?(adapter.to_sym)
+ adapter.prepend('jdbc:') if RUBY_ENGINE == 'jruby'
+ end
path =
- if adapter == "sqlite"
+ if adapter.include?('sqlite')
"#{root}/#{database}"
else
db_path = [hostname, database].join('/')
34
--- a/example/example.cpp
+++ b/example/example.cpp
@@ -57,7 +57,7 @@ int main(int, char* [])
for(int i = 0; i < 10; ++i)
file_logger->info("{} * {} equals {:>10}", i, i, i*i);
- //Customize msg format for all messages
+ //Customize msg format for all messages
spd::set_pattern("*** [%H:%M:%S %z] [thread %t] %v ***");
file_logger->info("This is another message with custom format");
@@ -76,7 +76,7 @@ int main(int, char* [])
async_file->info() << "This is async log.." << "Should be very fast!";
#ifdef __linux__
- // syslog example
+ // syslog example. linux only..
std::string ident = "spdlog-example";
auto syslog_logger = spd::syslog_logger("syslog", ident, LOG_PID);
syslog_logger->warn("This is warning that will end up in syslog. This is Linux only!");
3
--- a/rpc.py
+++ b/rpc.py
@@ -93,7 +93,9 @@ def loop(interface_queue, rpc_queue, cfg):
stop(interface_queue, "failed to connect to bitcoind (handle not obtained)")
return True
- last_update = time.time() - 2
+ update_interval = 2 # seconds
+
+ last_update = time.time() - update_interval
info = rpcrequest(rpchandle, 'getinfo', interface_queue)
if not info:
@@ -232,18 +234,18 @@ def loop(interface_queue, rpc_queue, cfg):
iterations += 1
- elif (time.time() - last_update) > 2:
+ elif (time.time() - last_update) > update_interval:
update_time = time.time()
log('debug.log', 1, 'updating (' + "%.3f" % (time.time() - last_update) + 's since last)')
rpcrequest(rpchandle, 'getnettotals', interface_queue)
rpcrequest(rpchandle, 'getconnectioncount', interface_queue)
- rpcrequest(rpchandle, 'getmininginfo', interface_queue)
+ mininginfo = rpcrequest(rpchandle, 'getmininginfo', interface_queue)
#TODO: update errors line on the fly
rpcrequest(rpchandle, 'getbalance', interface_queue)
rpcrequest(rpchandle, 'getunconfirmedbalance', interface_queue)
- blockcount = rpcrequest(rpchandle, 'getblockcount', interface_queue)
+ blockcount = mininginfo['blocks']
if blockcount:
if (prev_blockcount != blockcount): # minimise RPC calls
if prev_blockcount == 0:
34
--- a/example/example.cpp
+++ b/example/example.cpp
@@ -33,10 +33,10 @@ int main(int, char* [])
namespace spd = spdlog;
try
{
- // Set log level to all loggers to DEBUG and above
+ // Set log level to all loggers to debug and above
spd::set_level(spd::level::debug);
- //Create console, multithreaded logger
+ // Create console, multithreaded logger
auto console = spd::stdout_logger_mt("console");
console->info("Welcome to spdlog!") ;
console->info("An info message example {}..", 1);
@@ -51,13 +51,13 @@ int main(int, char* [])
console->info("{:>30}", "right aligned");
console->info("{:^30}", "centered");
- //Create a file rotating logger with 5mb size max and 3 rotated files
+ // Create a file rotating logger with 5mb size max and 3 rotated files
auto file_logger = spd::rotating_logger_mt("file_logger", "logs/mylogfile", 1048576 * 5, 3);
file_logger->set_level(spd::level::info);
for(int i = 0; i < 10; ++i)
file_logger->info("{} * {} equals {:>10}", i, i, i*i);
- //Customize msg format for all messages
+ // Customize msg format for all messages
spd::set_pattern("*** [%H:%M:%S %z] [thread %t] %v ***");
file_logger->info("This is another message with custom format");
@@ -75,8 +75,8 @@ int main(int, char* [])
auto async_file= spd::daily_logger_st("async_file_logger", "logs/async_log.txt");
async_file->info() << "This is async log.." << "Should be very fast!";
+ // syslog example. linux only..
#ifdef __linux__
- // syslog example. linux only..
std::string ident = "spdlog-example";
auto syslog_logger = spd::syslog_logger("syslog", ident, LOG_PID);
syslog_logger->warn("This is warning that will end up in syslog. This is Linux only!");
3
--- a/Wrapper/ToolbarWrapper.cs
+++ b/Wrapper/ToolbarWrapper.cs
@@ -402,7 +402,7 @@ public interface IVisibility {
/// <example>
/// <code>
/// IButton button = ...
- /// button.Visibility = new GameScenesVisibility(GameScenes.EDITOR, GameScenes.SPH);
+ /// button.Visibility = new GameScenesVisibility(GameScenes.EDITOR);
/// </code>
/// </example>
/// <seealso cref="IButton.Visibility"/>
304
--- a/src/js/core/factories/GridOptions.js
+++ b/src/js/core/factories/GridOptions.js
@@ -24,15 +24,21 @@ angular.module('ui.grid')
*
* To provide default options for all of the grids within your application, use an angular
* decorator to modify the GridOptions factory.
- * <pre>app.config(function($provide){
- * $provide.decorator('GridOptions',function($delegate){
- * return function(){
- * var defaultOptions = new $delegate();
- * defaultOptions.excludeProperties = ['id' ,'$$hashKey'];
- * return defaultOptions;
- * };
- * })
- * })</pre>
+ * <pre>
+ * app.config(function($provide){
+ * $provide.decorator('GridOptions',function($delegate){
+ * var gridOptions;
+ * gridOptions = angular.copy($delegate);
+ * gridOptions.initialize = function(options) {
+ * var initOptions;
+ * initOptions = $delegate.initialize(options);
+ * initOptions.enableColumnMenus = false;
+ * return initOptions;
+ * };
+ * return gridOptions;
+ * });
+ * });
+ * </pre>
*/
return {
initialize: function( baseOptions ){
3
--- a/wp-content/plugins/buddypress/bp-templates/bp-legacy/buddypress/members/index.php
+++ b/wp-content/plugins/buddypress/bp-templates/bp-legacy/buddypress/members/index.php
@@ -38,7 +38,7 @@
<option value="newest"><?php _e( 'Newest Registered', 'buddypress' ); ?></option>
<?php if ( bp_is_active( 'xprofile' ) ) : ?>
- <option value="alphabetical" selected="selected"><?php _e( 'Alphabetical', 'buddypress' ); ?></option>
+ <option value="alphabetical"><?php _e( 'Alphabetical', 'buddypress' ); ?></option>
<?php endif; ?>
<?php do_action( 'bp_members_directory_order_options' ); ?>
835
--- a/src/Cache/Engine/FileEngine.php
+++ b/src/Cache/Engine/FileEngine.php
@@ -46,7 +46,7 @@ class FileEngine extends CacheEngine {
* - `isWindows` Automatically populated with whether the host is windows or not
* - `lock` Used by FileCache. Should files be locked before writing to them?
* - `mask` The mask used for created files
- * - `path` Path to where cachefiles should be saved.
+ * - `path` Path to where cachefiles should be saved. Defaults to system's temp dir.
* - `prefix` Prepended to all entries. Good for when you need to share a keyspace
* with either another cache config or another application.
* - `probability` Probability of hitting a cache gc cleanup. Setting to 0 will disable
@@ -61,7 +61,7 @@ class FileEngine extends CacheEngine {
'isWindows' => false,
'lock' => true,
'mask' => 0664,
- 'path' => CACHE,
+ 'path' => null,
'prefix' => 'cake_',
'probability' => 100,
'serialize' => true
@@ -85,6 +85,9 @@ class FileEngine extends CacheEngine {
public function init(array $config = []) {
parent::init($config);
+ if ($this->_config['path'] === null) {
+ $this->_config['path'] = sys_get_temp_dir();
+ }
if (DS === '\\') {
$this->_config['isWindows'] = true;
}
156
--- a/Rant/Vocabulary/VocabUtils.cs
+++ b/Rant/Vocabulary/VocabUtils.cs
@@ -17,6 +17,8 @@ public static string GetString(string str)
public static bool AssociatesWith(this RantDictionaryEntry a, RantDictionaryEntry b)
{
+ if (a == null || b == null) return false;
+
bool aNoneRequired = !a.GetRequiredClasses().Any();
bool bNoneRequired = !b.GetRequiredClasses().Any();
14
--- a/src/renderer2/tr_world.c
+++ b/src/renderer2/tr_world.c
@@ -1513,7 +1513,8 @@ static void IssueOcclusionQuery(link_t *queue, bspNode_t *node, qboolean resetMu
#if 1
if (!glIsQuery(node->occlusionQueryObjects[tr.viewCount]))
{
- Ren_Fatal("IssueOcclusionQuery: node %i has no occlusion query object in slot %i: %zu", node - tr.world->nodes, tr.viewCount, node->occlusionQueryObjects[tr.viewCount]);
+ // Ren_Fatal("IssueOcclusionQuery: node %i has no occlusion query object in slot %i: %i", node - tr.world->nodes, tr.viewCount, node->occlusionQueryObjects[tr.viewCount]);
+ Ren_Fatal("IssueOcclusionQuery: node %li has no occlusion query object in slot %i %lu", (long)(node - tr.world->nodes), tr.viewCount, (unsigned long)node->occlusionQueryObjects[tr.viewCount]);
}
#endif
410
--- a/presto-main/src/test/java/com/facebook/presto/sql/analyzer/TestAnalyzer.java
+++ b/presto-main/src/test/java/com/facebook/presto/sql/analyzer/TestAnalyzer.java
@@ -542,6 +542,7 @@ public void testExpressions()
// cast
assertFails(TYPE_MISMATCH, "SELECT CAST(date '2014-01-01' AS bigint)");
assertFails(TYPE_MISMATCH, "SELECT TRY_CAST(date '2014-01-01' AS bigint)");
+ assertFails(TYPE_MISMATCH, "SELECT CAST(null AS UNKNOWN)");
// arithmetic negation
assertFails(TYPE_MISMATCH, "SELECT -'a' FROM t1");