[packages/rstudio.git] / boost-moc.patch

--- rstudio-0.99.39/src/cpp/core/include/core/FilePath.hpp~	2015-02-19 21:35:05.000000000 +0100
+++ rstudio-0.99.39/src/cpp/core/include/core/FilePath.hpp	2015-02-19 21:35:13.360551778 +0100
@@ -23,7 +23,9 @@
 #include <boost/scoped_ptr.hpp>
 #include <boost/function.hpp>
 
+#ifndef Q_MOC_RUN
 #include <boost/utility.hpp>
+#endif
 
 #include <core/Error.hpp>
 #include <core/Log.hpp>
--- rstudio-0.99.39/src/cpp/desktop/DesktopSessionLauncher.hpp~	2015-02-19 21:37:22.000000000 +0100
+++ rstudio-0.99.39/src/cpp/desktop/DesktopSessionLauncher.hpp	2015-02-19 21:46:51.487213390 +0100
@@ -18,7 +18,9 @@
 
 #include <string>
 
+#ifndef Q_MOC_RUN
 #include <boost/utility.hpp>
+#endif
 
 #include <core/Error.hpp>
 #include <core/FilePath.hpp>
Commit	Line	Data
ff706f6c JR	1	--- rstudio-0.99.39/src/cpp/core/include/core/FilePath.hpp~ 2015-02-19 21:35:05.000000000 +0100
	2	+++ rstudio-0.99.39/src/cpp/core/include/core/FilePath.hpp 2015-02-19 21:35:13.360551778 +0100
	3	@@ -23,7 +23,9 @@
	4	#include <boost/scoped_ptr.hpp>
	5	#include <boost/function.hpp>
	6
	7	+#ifndef Q_MOC_RUN
	8	#include <boost/utility.hpp>
	9	+#endif
	10
	11	#include <core/Error.hpp>
	12	#include <core/Log.hpp>
	13	--- rstudio-0.99.39/src/cpp/desktop/DesktopSessionLauncher.hpp~ 2015-02-19 21:37:22.000000000 +0100
	14	+++ rstudio-0.99.39/src/cpp/desktop/DesktopSessionLauncher.hpp 2015-02-19 21:46:51.487213390 +0100
	15	@@ -18,7 +18,9 @@
	16
	17	#include <string>
	18
	19	+#ifndef Q_MOC_RUN
	20	#include <boost/utility.hpp>
	21	+#endif
	22
	23	#include <core/Error.hpp>
	24	#include <core/FilePath.hpp>