16
--- a/lib/CBattleCallback.cpp
+++ b/lib/CBattleCallback.cpp
@@ -2224,7 +2224,7 @@ SpellID CBattleInfoCallback::getRandomBeneficialSpell(const CStack * subject) co
for(const CSpell *spell : VLC->spellh->objects)
{
- if (spell->isPositive()) //only positive
+ if (spell->isPositive() && !spell->isRisingSpell()) //only positive and not rising
{
if (subject->hasBonusFrom(Bonus::SPELL_EFFECT, spell->id)
|| battleCanCastThisSpellHere(subject->owner, spell, ECastingMode::CREATURE_ACTIVE_CASTING, subject->position) != ESpellCastProblem::OK)
123
--- a/portlets/knowledge-base-portlet/docroot/WEB-INF/src/com/liferay/knowledgebase/hook/upgrade/v1_3_4/UpgradeResourceAction.java
+++ b/portlets/knowledge-base-portlet/docroot/WEB-INF/src/com/liferay/knowledgebase/hook/upgrade/v1_3_4/UpgradeResourceAction.java
@@ -15,8 +15,14 @@
package com.liferay.knowledgebase.hook.upgrade.v1_3_4;
import com.liferay.knowledgebase.util.ActionKeys;
+import com.liferay.portal.kernel.dao.jdbc.DataAccess;
import com.liferay.portal.kernel.upgrade.UpgradeProcess;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
/**
* @author Adolfo Prez
*/
@@ -24,10 +30,45 @@
@Override
protected void doUpgrade() throws Exception {
- runSQL(
- "update ResourceAction set actionId = '" +
- ActionKeys.VIEW_SUGGESTIONS + "' where actionId = " +
- "'VIEW_KB_FEEDBACK'");
+ if (_hasViewFeedbackResourceAction()) {
+ runSQL(
+ "delete from ResourceAction where actionId = '" +
+ ActionKeys.VIEW_SUGGESTIONS + "'");
+
+ runSQL(
+ "update ResourceAction set actionId = '" +
+ ActionKeys.VIEW_SUGGESTIONS + "' where actionId = '" +
+ _ACTION_ID_VIEW_KB_FEEDBACK + "'");
+ }
}
+ private boolean _hasViewFeedbackResourceAction() throws SQLException {
+ Connection con = null;
+ PreparedStatement ps = null;
+ ResultSet rs = null;
+
+ try {
+ con = DataAccess.getUpgradeOptimizedConnection();
+
+ ps = con.prepareStatement(
+ "select count(*) from ResourceAction where actionId = ?");
+
+ ps.setString(1, _ACTION_ID_VIEW_KB_FEEDBACK);
+
+ rs = ps.executeQuery();
+
+ if (rs.next()) {
+ return rs.getInt(1) > 0;
+ }
+
+ return false;
+ }
+ finally {
+ DataAccess.cleanUp(con, ps, rs);
+ }
+ }
+
+ private static final String _ACTION_ID_VIEW_KB_FEEDBACK =
+ "VIEW_KB_FEEDBACK";
+
}
\ No newline at end of file
4
--- a/org/lateralgm/main/LGM.java
+++ b/org/lateralgm/main/LGM.java
@@ -849,13 +849,27 @@ public static void reload(boolean newRoot)
{
LGM.mdi.closeAll();
- InvisibleTreeModel ml = new InvisibleTreeModel(LGM.root);
- LGM.tree.setModel(ml);
+ //TODO: Swing code must be executed on the Swing thread,
+ //without delaying this passing a GMX to the main method
+ //when launching will sometimes, about once every 5 loads,
+ //throw an exception when setModel is called.
+ //After several hours and days of testing I still haven't figured out why
+ //the GMK reader doesn't have this but the GMX reader does, I believe because the GMX
+ //reader uses more postponed references, but I can't figure out where or how it correlates. - Robert
+ SwingUtilities.invokeLater(new Runnable() {
+
+ @Override
+ public void run()
+ {
+ InvisibleTreeModel ml = new InvisibleTreeModel(LGM.root);
+ LGM.tree.setModel(ml);
+ ml.activateFilter(pruneResultsCB.isSelected());
+ if (ml.isActivatedFilter()) {
+ applyFilter(root.getChildren(),ml.isActivatedFilter(),filterText.getText(),false,wholeWordCB.isSelected(),true);
+ }
+ }
- ml.activateFilter(pruneResultsCB.isSelected());
- if (ml.isActivatedFilter()) {
- applyFilter(root.getChildren(),ml.isActivatedFilter(),filterText.getText(),false,wholeWordCB.isSelected(),true);
- }
+ });
LGM.tree.setSelectionRow(0);
264
--- a/lib/generators/doorkeeper/templates/initializer.rb
+++ b/lib/generators/doorkeeper/templates/initializer.rb
@@ -64,11 +64,11 @@
#
# native_redirect_uri 'urn:ietf:wg:oauth:2.0:oob'
- # Forces the usage of the HTTPS protocol in non-native redirect uris (enabled by default in non-development environments).
- # OAuth2 delegates security in communication to the HTTPS protocol so it is wise to keep this enabled.
+ # Forces the usage of the HTTPS protocol in non-native redirect uris (enabled
+ # by default in non-development environments). OAuth2 delegates security in
+ # communication to the HTTPS protocol so it is wise to keep this enabled.
#
- # Example implementation:
- # force_ssl_in_redirect_uri true
+ # force_ssl_in_redirect_uri !Rails.env.development?
# Specify what grant flows are enabled in array of Strings. The valid
# strings and the flows they enable are:
3
--- a/quake.rb
+++ b/quake.rb
@@ -3,14 +3,12 @@
class Quake < Formula
homepage "http://www.cbcb.umd.edu/software/quake/"
#doi "10.1186/gb-2010-11-11-r116"
+ #tag "bioinformatics"
url "http://www.cbcb.umd.edu/software/quake/downloads/quake-0.3.5.tar.gz"
sha1 "5ee22ae15415b97ef88e55f0dc786d07ed7aff7b"
- fails_with :clang do
- build 503
- cause "error: 'omp.h' file not found"
- end
+ needs :openmp
depends_on "boost"
depends_on "jellyfish"
10
--- a/src/main/java/org/fenixedu/academic/servlet/FenixInitializer.java
+++ b/src/main/java/org/fenixedu/academic/servlet/FenixInitializer.java
@@ -154,7 +154,7 @@ public boolean shouldFilter(HttpServletRequest request) {
&& request.getQueryString().indexOf("method=viewThread") >= 0) {
return false;
}
- if ((uri.equals("/teacher/testsManagement.do") || uri.equals("/student/studentTests.do"))
+ if ((uri.equals("/oldOnlineTests/testsManagement.do") || uri.equals("/student/studentTests.do"))
&& "showImage".equals(request.getParameter("method"))) {
return false;
}
26
--- a/lib/Cli.php
+++ b/lib/Cli.php
@@ -303,7 +303,7 @@ protected function showHelp() {
$this->log($this->colorize('green', ' convert') . ' source_file [output_file] Converts a file.');
$this->log($this->colorize('green', ' color') . ' source_file Colorize a file, useful for debbugging.');
$this->log(
-<<<HELP
+ <<<HELP
If source_file is set as '-', STDIN will be used.
If output_file is omitted, STDOUT will be used.
3
--- a/tests/com/sun/cldc/io/TestResourceInputStream.java
+++ b/tests/com/sun/cldc/io/TestResourceInputStream.java
@@ -6,6 +6,8 @@
import java.io.*;
public class TestResourceInputStream implements Testlet {
+ TestHarness th;
+
private String readLine(InputStreamReader reader) throws IOException {
// Test whether the end of file has been reached. If so, return null.
int readChar = reader.read();
@@ -29,11 +31,21 @@ private String readLine(InputStreamReader reader) throws IOException {
return string.toString();
}
+ public void readWithStreamReader(ResourceInputStream stream) throws IOException {
+ InputStreamReader reader = new InputStreamReader(stream);
+ th.check(readLine(reader), " ");
+ th.check(readLine(reader) == null);
+ }
+
public void test(TestHarness th) {
+ this.th = th;
+
try {
- InputStreamReader reader = new InputStreamReader(getClass().getResourceAsStream("utf8.txt"));
- th.check(readLine(reader), " ");
- th.check(readLine(reader) == null);
+ ResourceInputStream stream = (ResourceInputStream)getClass().getResourceAsStream("utf8.txt");
+ stream.mark(0);
+ readWithStreamReader(stream);
+ stream.reset();
+ readWithStreamReader(stream);
} catch (Exception e) {
th.fail("Unexpected exception: " + e);
e.printStackTrace();
3217
--- a/Library/Formula/osquery.rb
+++ b/Library/Formula/osquery.rb
@@ -4,10 +4,11 @@ class Osquery < Formula
homepage "http://osquery.io"
# pull from git tag to get submodules
url "https://github.com/facebook/osquery.git", :tag => "1.1.0"
+ revision 1
bottle do
- sha1 "bc40b678cdbd4948059942d7f48ccc5facabe923" => :yosemite
- sha1 "1ff2f50334ca44170a969f25707a5b4018d7e28d" => :mavericks
+ sha1 "f1defab77ba329ecbe64da7f3b3f4812bff3e656" => :yosemite
+ sha1 "5b374d8a4bddf9058abd78a7974436815611306c" => :mavericks
end
# Build currently fails on Mountain Lion:
129
--- a/src/version.c
+++ b/src/version.c
@@ -40,6 +40,18 @@ DebugSymbol::DebugSymbol(Loc loc, unsigned level)
this->loc = loc;
}
+char *DebugSymbol::toChars()
+{
+ if (ident)
+ return ident->toChars();
+ else
+ {
+ OutBuffer buf;
+ buf.printf("%d", level);
+ return buf.extractString();
+ }
+}
+
Dsymbol *DebugSymbol::syntaxCopy(Dsymbol *s)
{
assert(!s);
@@ -117,6 +129,18 @@ VersionSymbol::VersionSymbol(Loc loc, unsigned level)
this->loc = loc;
}
+char *VersionSymbol::toChars()
+{
+ if (ident)
+ return ident->toChars();
+ else
+ {
+ OutBuffer buf;
+ buf.printf("%d", level);
+ return buf.extractString();
+ }
+}
+
Dsymbol *VersionSymbol::syntaxCopy(Dsymbol *s)
{
assert(!s);
3
--- a/code/js/contentscript.js
+++ b/code/js/contentscript.js
@@ -3,10 +3,10 @@
chrome.runtime.sendMessage({action: "check_music_site"}, function(resp) {
if(resp !== "no_inject") {
- // Set the browser action icon based on site enabled/disabled status
- chrome.runtime.sendMessage({action: "set_icon"});
-
if(resp) {
+ // Set the browser action icon based on site enabled/disabled status
+ chrome.runtime.sendMessage({action: "set_icon"});
+
chrome.runtime.sendMessage({action: "get_site_controller"}, function(controller) {
if(controller) chrome.runtime.sendMessage({action: "inject_controller", file: "js/controllers/" + controller});
});
3
--- a/public/css/main.css
+++ b/public/css/main.css
@@ -1185,6 +1185,9 @@ button, input[type="submit"], input[type="button"] {
.no-js .Form-footer {
float: right; }
+.Form--inline {
+ display: inline; }
+
/* ============================
TOGGLE-SWITCH
============================ */
3
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -62,7 +62,7 @@ int main() {
auto builder = llvm::IRBuilder<>(main_entry);
auto test_parse =
- parse("[print [if [== 5.9 5.8999] \"ya rly\" \"no rly\"]]");
+ parse("[print [if [== 5.9 5.8999] 5 [+ 6 6]]]");
std::cout << "Parsed Program: " << std::endl << std::endl;
for (const auto &i : test_parse) {
6
--- a/src/TwoWayArrayPath.java
+++ b/src/TwoWayArrayPath.java
@@ -92,6 +92,10 @@ public void removeEdge(int a, int b) {
return -1;
}
+ @Override public boolean inOrder(int a, int b, int c) {
+ throw new NotImplementedException();
+ }
+
/**
* @return the total length of the path
*/
20
--- a/src/Graphics/TextureCollection.cs
+++ b/src/Graphics/TextureCollection.cs
@@ -21,7 +21,8 @@ public sealed class TextureCollection
}
set
{
- if (textures[index] != value)
+ // FIXME: Bring this back after the IGLDevice is established.
+ // if (textures[index] != value)
{
textures[index] = value;
if (!graphicsDevice.ModifiedSamplers.Contains(index))
20
--- a/src/Graphics/TextureCollection.cs
+++ b/src/Graphics/TextureCollection.cs
@@ -21,7 +21,8 @@ public sealed class TextureCollection
}
set
{
- if (textures[index] != value)
+ // FIXME: Bring this back after the IGLDevice is established.
+ // if (textures[index] != value)
{
textures[index] = value;
if (!graphicsDevice.ModifiedSamplers.Contains(index))
3
--- a/llvm/include/llvm/Support/MathExtras.h
+++ b/llvm/include/llvm/Support/MathExtras.h
@@ -72,7 +72,7 @@ countTrailingZeros(T Val, ZeroBehavior ZB = ZB_Width) {
template <typename T>
typename std::enable_if<std::numeric_limits<T>::is_integer &&
std::numeric_limits<T>::is_signed, std::size_t>::type
-countTrailingZeros(T Val, ZeroBehavior ZB = ZB_Width) LLVM_DELETED_FUNCTION;
+countTrailingZeros(T, ZeroBehavior = ZB_Width) LLVM_DELETED_FUNCTION;
#if __GNUC__ >= 4 || _MSC_VER
template <>
@@ -138,7 +138,7 @@ countLeadingZeros(T Val, ZeroBehavior ZB = ZB_Width) {
template <typename T>
typename std::enable_if<std::numeric_limits<T>::is_integer &&
std::numeric_limits<T>::is_signed, std::size_t>::type
-countLeadingZeros(T Val, ZeroBehavior ZB = ZB_Width) LLVM_DELETED_FUNCTION;
+countLeadingZeros(T, ZeroBehavior = ZB_Width) LLVM_DELETED_FUNCTION;
#if __GNUC__ >= 4 || _MSC_VER
template <>
@@ -193,7 +193,7 @@ findFirstSet(T Val, ZeroBehavior ZB = ZB_Max) {
template <typename T>
typename std::enable_if<std::numeric_limits<T>::is_integer &&
std::numeric_limits<T>::is_signed, T>::type
-findFirstSet(T Val, ZeroBehavior ZB = ZB_Max) LLVM_DELETED_FUNCTION;
+findFirstSet(T, ZeroBehavior = ZB_Max) LLVM_DELETED_FUNCTION;
/// \brief Get the index of the last set bit starting from the least
/// significant bit.
@@ -219,7 +219,7 @@ findLastSet(T Val, ZeroBehavior ZB = ZB_Max) {
template <typename T>
typename std::enable_if<std::numeric_limits<T>::is_integer &&
std::numeric_limits<T>::is_signed, T>::type
-findLastSet(T Val, ZeroBehavior ZB = ZB_Max) LLVM_DELETED_FUNCTION;
+findLastSet(T, ZeroBehavior = ZB_Max) LLVM_DELETED_FUNCTION;
/// \brief Macro compressed bit reversal table for 256 bits.
///
3
--- a/include/llvm/Support/MathExtras.h
+++ b/include/llvm/Support/MathExtras.h
@@ -72,7 +72,7 @@ countTrailingZeros(T Val, ZeroBehavior ZB = ZB_Width) {
template <typename T>
typename std::enable_if<std::numeric_limits<T>::is_integer &&
std::numeric_limits<T>::is_signed, std::size_t>::type
-countTrailingZeros(T Val, ZeroBehavior ZB = ZB_Width) LLVM_DELETED_FUNCTION;
+countTrailingZeros(T, ZeroBehavior = ZB_Width) LLVM_DELETED_FUNCTION;
#if __GNUC__ >= 4 || _MSC_VER
template <>
@@ -138,7 +138,7 @@ countLeadingZeros(T Val, ZeroBehavior ZB = ZB_Width) {
template <typename T>
typename std::enable_if<std::numeric_limits<T>::is_integer &&
std::numeric_limits<T>::is_signed, std::size_t>::type
-countLeadingZeros(T Val, ZeroBehavior ZB = ZB_Width) LLVM_DELETED_FUNCTION;
+countLeadingZeros(T, ZeroBehavior = ZB_Width) LLVM_DELETED_FUNCTION;
#if __GNUC__ >= 4 || _MSC_VER
template <>
@@ -193,7 +193,7 @@ findFirstSet(T Val, ZeroBehavior ZB = ZB_Max) {
template <typename T>
typename std::enable_if<std::numeric_limits<T>::is_integer &&
std::numeric_limits<T>::is_signed, T>::type
-findFirstSet(T Val, ZeroBehavior ZB = ZB_Max) LLVM_DELETED_FUNCTION;
+findFirstSet(T, ZeroBehavior = ZB_Max) LLVM_DELETED_FUNCTION;
/// \brief Get the index of the last set bit starting from the least
/// significant bit.
@@ -219,7 +219,7 @@ findLastSet(T Val, ZeroBehavior ZB = ZB_Max) {
template <typename T>
typename std::enable_if<std::numeric_limits<T>::is_integer &&
std::numeric_limits<T>::is_signed, T>::type
-findLastSet(T Val, ZeroBehavior ZB = ZB_Max) LLVM_DELETED_FUNCTION;
+findLastSet(T, ZeroBehavior = ZB_Max) LLVM_DELETED_FUNCTION;
/// \brief Macro compressed bit reversal table for 256 bits.
///
3
index 0000000..7525c90
--- /dev/null
+++ b/prompt_windows.c
@@ -0,0 +1,27 @@
+#include <stdio.h>
+#include <stdlib.h>
+
+/* Declare a buffer for user input of size 2048 */
+static char input[2048];
+
+int main(int argc, char *argv[])
+{
+ /* Print Version and Exit Information */
+ puts("LISPish Version 0.0.0.0.1");
+ puts("Press Ctrl-c to Exit\n");
+
+ /* Never-ending loop */
+ while (1) {
+
+ /* Outputs prompt */
+ fputs("lispish> ", stdout);
+
+ /* Read line of user input of maximum size 2048 */
+ fgets(input, 2048, stdin);
+
+ /* Echo input back to user */
+ printf("No you're a %s", input);
+ }
+
+ return 0;
+}
3
--- a/public/css/main.css
+++ b/public/css/main.css
@@ -2378,7 +2378,9 @@ table {
border-collapse: collapse; }
td, th {
- border: 1px 0 1px 0 solid #888; }
+ border-width: 1px 0 1px 0;
+ border-style: solid;
+ border-color: #888; }
tbody tr:nth-child(odd) {
background-color: #ffffff; }
@@ -2394,7 +2396,7 @@ thead th {
font-size: 1.1em; }
td, th {
- padding: 10px; }
+ padding: 1em; }
table.Table--centeredContent {
text-align: center; }