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

[Daniel van Vugt]

Templates relating to CompRegion should only be instantiated in core and
never in any plugins.
(LP: #1067218)

Note: This required removing -std=c++0x from the opengl plugin. That flag
was causing opengl to have slightly different symbol requirements to the
template instance in core. Not that it matters because -std=c++0x appears to
have been unused by opengl.

[PS Jenkins bot (ps-jenkins)]

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

review: Needs Fixing (continuous-integration)

[Sam Spilsbury (smspillaz)]

review: Approve

[Sam Spilsbury (smspillaz)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

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

review: Needs Fixing (continuous-integration)

=== modified file 'plugins/opengl/CMakeLists.txt'
--- plugins/opengl/CMakeLists.txt	2012-09-22 04:00:52 +0000
+++ plugins/opengl/CMakeLists.txt	2012-10-16 07:05:21 +0000
@@ -15,11 +15,11 @@
 include_directories (src/glxtfpbind/include)
 
 if (USE_GLES)
-    compiz_plugin(opengl PLUGINDEPS composite CFLAGSADD "-DUSE_GLES -std=c++0x" LIBRARIES ${OPENGLES2_LIBRARIES} ${INTERNAL_LIBRARIES} dl INCDIRS ${OPENGLES2_INCLUDE_DIR})
+    compiz_plugin(opengl PLUGINDEPS composite CFLAGSADD "-DUSE_GLES" LIBRARIES ${OPENGLES2_LIBRARIES} ${INTERNAL_LIBRARIES} dl INCDIRS ${OPENGLES2_INCLUDE_DIR})
 else (USE_GLES)
     find_package (OpenGL)
     if (OPENGL_FOUND)
-	compiz_plugin(opengl PLUGINDEPS composite CFLAGSADD -std=c++0x LIBRARIES ${OPENGL_gl_LIBRARY} ${INTERNAL_LIBRARIES} dl INCDIRS ${OPENGL_INCLUDE_DIR})
+	compiz_plugin(opengl PLUGINDEPS composite LIBRARIES ${OPENGL_gl_LIBRARY} ${INTERNAL_LIBRARIES} dl INCDIRS ${OPENGL_INCLUDE_DIR})
     endif (OPENGL_FOUND)
 endif (USE_GLES)
 
 
=== modified file 'src/region/include/core/region.h'
--- src/region/include/core/region.h	2012-05-21 06:43:20 +0000
+++ src/region/include/core/region.h	2012-10-16 07:05:21 +0000
@@ -32,6 +32,9 @@
 #include <core/rect.h>
 #include <core/point.h>
 
+class CompRegion;
+extern template class std::vector<CompRegion>;
+
 /**
  * A 2D region with an (x,y) position and arbitrary dimensions similar to
  * an XRegion. It's data membmers are private and  must be manipulated with
 
=== modified file 'src/region/src/region.cpp'
--- src/region/src/region.cpp	2012-05-21 06:43:20 +0000
+++ src/region/src/region.cpp	2012-10-16 07:05:21 +0000
@@ -36,6 +36,8 @@
 #include <boost/foreach.hpp>
 #define foreach BOOST_FOREACH
 
+template class std::vector<CompRegion>;
+
 const CompRegion infiniteRegion (CompRect (MINSHORT, MINSHORT,
 				           MAXSHORT * 2, MAXSHORT * 2));
 const CompRegion emptyRegion;