Merge lp:~vanvugt/compiz/fix-1067598 into lp:compiz/0.9.9

[Daniel van Vugt]

Make core extern std templates compatible with C++0x projects like Unity.
(LP: #1067598)

Since I can't reproduce this original problem with Unity, I'd like someone who can to test this.

[Brandon Schaefer (brandontschaefer)]

Confirmed fixing the compiler error, and the changes look good.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3432
http://jenkins.qa.ubuntu.com/job/compiz-ci/199/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-ci/./build=pbuilder,distribution=quantal,flavor=amd64/199/console

review: Needs Fixing (continuous-integration)

=== modified file 'include/core/CMakeLists.txt'
--- include/core/CMakeLists.txt	2012-09-04 15:33:44 +0000
+++ include/core/CMakeLists.txt	2012-10-17 06:28:24 +0000
@@ -16,6 +16,7 @@
     session.h
     size.h
     string.h
+    templates.h
     window.h
     wrapsystem.h
     abiversion.h

=== modified file 'include/core/option.h'
--- include/core/option.h	2012-10-16 03:36:10 +0000
+++ include/core/option.h	2012-10-17 06:28:24 +0000
@@ -28,6 +28,7 @@
 #ifndef _COMPOPTION_H
 #define _COMPOPTION_H
 
+#include <core/templates.h>
 #include <core/string.h>
 
 #include <boost/variant.hpp>
@@ -302,9 +303,9 @@
 	PrivateOption *priv;
 };
 
-extern template class std::vector<unsigned short>;
-extern template class std::vector<CompOption::Value>;
-extern template class std::vector<CompOption>;
+COMPIZ_EXTERN_STD(vector<unsigned short>)
+COMPIZ_EXTERN_STD(vector<CompOption::Value>)
+COMPIZ_EXTERN_STD(vector<CompOption>)
 
 namespace compiz {
 namespace detail {

=== added file 'include/core/templates.h'
--- include/core/templates.h	1970-01-01 00:00:00 +0000
+++ include/core/templates.h	2012-10-17 06:28:24 +0000
@@ -0,0 +1,14 @@
+#ifndef _COMPIZ_TEMPLATES_H
+#define _COMPIZ_TEMPLATES_H
+
+#ifdef __GXX_EXPERIMENTAL_CXX0X__
+// Compiz core is built for C++98. If you're not then get your own templates...
+#define COMPIZ_EXTERN_STD(_c)
+#else
+#define COMPIZ_EXTERN_STD(_c)  extern template class std::_c;
+#endif
+
+// Non-std templates are unaffected by C++0x
+#define COMPIZ_EXTERN(_c)  extern template class _c;
+
+#endif

=== modified file 'src/rect/include/core/rect.h'
--- src/rect/include/core/rect.h	2012-10-16 15:57:29 +0000
+++ src/rect/include/core/rect.h	2012-10-17 06:28:24 +0000
@@ -26,6 +26,7 @@
 #ifndef _COMPRECT_H
 #define _COMPRECT_H
 
+#include <core/templates.h>
 #include <core/point.h>
 #include <core/size.h>
 #include <vector>
@@ -135,7 +136,7 @@
 	REGION       mRegion;
 };
 
-extern template class std::vector<CompRect>;
+COMPIZ_EXTERN_STD(vector<CompRect>)
 
 namespace compiz
 {

=== modified file 'src/region/include/core/region.h'
--- src/region/include/core/region.h	2012-10-16 15:57:29 +0000
+++ src/region/include/core/region.h	2012-10-17 06:28:24 +0000
@@ -29,11 +29,12 @@
 #include <X11/Xutil.h>
 #include <X11/Xregion.h>
 
+#include <core/templates.h>
 #include <core/rect.h>
 #include <core/point.h>
 
 class CompRegion;
-extern template class std::vector<CompRegion>;
+COMPIZ_EXTERN_STD(vector<CompRegion>)
 
 /**
  * A 2D region with an (x,y) position and arbitrary dimensions similar to