Merge branch 'mainline-0.1' of /srv/git.sesse.net/private/ccbs into mainline-0.1

diff --git a/bigscreen/Makefile b/bigscreen/Makefile
index e95b4af62906c1833d7ffe89c3eda2263e7e72d0..401074b2e2dab99e31222fd8def417689c920791 100644 (file)
--- a/bigscreen/Makefile
+++ b/bigscreen/Makefile
@@ -3,7 +3,7 @@ CXX=g++
 CPPFLAGS=-I/usr/include/postgresql $(shell freetype-config --cflags) -Itinyptc/
 CXXFLAGS=-O2 -Wall
 LDFLAGS=-L/usr/X11R6/lib
-LIBS=$(shell freetype-config --libs) $(shell libpq3-config) -lpqxx tinyptc/libtinyptc.a -lX11 -lXext -lXxf86vm -lXxf86dga
+LIBS=$(shell freetype-config --libs) -lpqxx tinyptc/libtinyptc.a -lX11 -lXext -lXxf86vm -lXxf86dga
 
 CCBS_BIGSCREEN_SQL_OBJS=fetch_current_tournament.o fetch_list_of_active_groups.o \
        fetch_list_of_finished_groups.o \

diff --git a/bigscreen/fetch_group.cpp b/bigscreen/fetch_group.cpp
index 7bca2f63e42b06018227716c6198df3a66929290..2c58762de64e9550156694f444c4dd62902bf79c 100644 (file)
--- a/bigscreen/fetch_group.cpp
+++ b/bigscreen/fetch_group.cpp
@@ -60,9 +60,5 @@ void FetchGroup::operator() (pqxx::transaction<> &t)
 
                curr_group.players[curr_group.players.size() - 1].scores.push_back(sc);
        }
-}
-
-void FetchGroup::OnCommit()
-{
        *dest_group = curr_group;
 }

diff --git a/bigscreen/fetch_group.h b/bigscreen/fetch_group.h
index 78b943ed6e4b6af2bee00346bbf47e84cafd9ad9..33e6a0b97fe68825bb75a38d4cbdc3d7cd5151a4 100644 (file)
--- a/bigscreen/fetch_group.h
+++ b/bigscreen/fetch_group.h
@@ -14,7 +14,6 @@ private:
 public:
        FetchGroup(unsigned tournament, unsigned round, unsigned parallel, Group *group);
        void operator() (pqxx::transaction<> &t);
-       void OnCommit();
 };
 
 #endif /* !defined(_FETCH_CURRENT_TOURNAMENT_H) */

diff --git a/bigscreen/fonts.cpp b/bigscreen/fonts.cpp
index cedd03affddd01fa4c859d3642177ea88bd9d646..df2360be5fc37436e1f005cf6aab9c4994093295 100644 (file)
--- a/bigscreen/fonts.cpp
+++ b/bigscreen/fonts.cpp
@@ -1,3 +1,4 @@
+#include <cstdio>
 #include <vector>
 #include <stdexcept>
 #include "fonts.h"

diff --git a/bigscreen/groupscreen.cpp b/bigscreen/groupscreen.cpp
index a9251a316a0ed663ee9ec5d900c953ee25fa069b..b2a63159540810fcd1f3d6be6202fc3b44d735e2 100644 (file)
--- a/bigscreen/groupscreen.cpp
+++ b/bigscreen/groupscreen.cpp
@@ -1,6 +1,7 @@
 #include <cstdio>
 #include <algorithm>
 #include <map>
+#include <assert.h>
 
 #include "resolution.h"
 #include "groupscreen.h"

diff --git a/bigscreen/widestring.cpp b/bigscreen/widestring.cpp
index 4b67ec7c2b168e158ccc90e1b90a7ad228d03256..a0d781a4edf5d22ded01667e4e84bc259c522670 100644 (file)
--- a/bigscreen/widestring.cpp
+++ b/bigscreen/widestring.cpp
@@ -1,3 +1,5 @@
+#include <stdlib.h>
+#include <cstring>
 #include <iconv.h>
 #include <endian.h>
 #include <exception>
@@ -65,9 +67,13 @@ void widestring::operator= (const char *from)
        delete[] to_buf;
 }
 
+namespace pqxx
+{
+
 template<>
-void pqxx::from_string<widestring>(const char *from, widestring &to)
+void from_string<widestring>(const char *from, widestring &to)
 {
        to = from;
 }
 
+}