projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
0582196
)
Revert "Try to fix some warnings when libdcp include asdcplib."
author
Carl Hetherington
<cth@carlh.net>
Thu, 21 Apr 2022 09:38:15 +0000
(11:38 +0200)
committer
Carl Hetherington
<cth@carlh.net>
Thu, 21 Apr 2022 09:38:15 +0000
(11:38 +0200)
This reverts commit
0582196d78d27c349e5be8f87186499acb4b322f
.
src/lib/compose.hpp
patch
|
blob
|
history
diff --git
a/src/lib/compose.hpp
b/src/lib/compose.hpp
index 32981abccd8d0fe1aa8b6fa7034b2de807dd93e6..479493f1461e5e7b0b9ab012eed013bfb96acc35 100644
(file)
--- a/
src/lib/compose.hpp
+++ b/
src/lib/compose.hpp
@@
-34,10
+34,7
@@
#ifndef DCPOMATIC_STRING_COMPOSE_H
#define DCPOMATIC_STRING_COMPOSE_H
-#include "warnings.h"
-DCPOMATIC_DISABLE_WARNINGS
#include <dcp/locale_convert.h>
-DCPOMATIC_ENABLE_WARNINGS
#include <boost/filesystem.hpp>
#include <string>
#include <list>