summaryrefslogtreecommitdiff
path: root/src/lib/server.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-03-12 22:29:20 +0000
committerCarl Hetherington <cth@carlh.net>2013-03-12 22:29:20 +0000
commit2f7180555f2d8b727bde21613fc2474bb4f7664c (patch)
tree791291da76fbcf31ce62f72d1a540b67ca20b4f3 /src/lib/server.cc
parent1895cfd9642f53dd4ea83e53a655f93c8a65b37e (diff)
parent7d262f9be3a4c5d8da07dce42f7e2da708f6c7f4 (diff)
Merge branch 'master' of /home/carl/git/dvdomatic
Diffstat (limited to 'src/lib/server.cc')
-rw-r--r--src/lib/server.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/server.cc b/src/lib/server.cc
index 76a25bfbb..9c5a77f68 100644
--- a/src/lib/server.cc
+++ b/src/lib/server.cc
@@ -77,7 +77,7 @@ ServerDescription::as_metadata () const
return s.str ();
}
-Server::Server (Log* log)
+Server::Server (shared_ptr<Log> log)
: _log (log)
{