Merge pull request gridcoin-community#1031 from tomasbrod/staging-f

Adjustments to compile code.
jamescowens · Mar 23, 2018 · f5c8161 · f5c8161
2 parents 72efb5d + 52b6b38
commit f5c8161
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/src/qt/votingdialog.h b/src/qt/votingdialog.h
@@ -185,8 +185,7 @@ class VotingChartDialog
  QLabel *question_;
  QLabel *url_;
 #ifdef QT_CHARTS_LIB
- QTCHARTS_USE_NAMESPACE;
- QChart *chart_;
+ QtCharts::QChart *chart_;
 #endif
  QTableWidget *answerTable_;
  QStringList answerTableHeader;

diff --git a/src/sync.cpp b/src/sync.cpp
@@ -102,7 +102,7 @@ static void push_lock(void* c, const CLockLocation& locklocation, bool fTry)
 
  std::lock_guard<std::mutex> lock(lockdata.dd_mutex);
 
- lockstack->push_back(std::make_pair(c, locklocation))
+ lockstack->push_back(std::make_pair(c, locklocation));
 
  for (const std::pair<void*, CLockLocation> & i : (*lockstack)) {
  if (i.first == c)