Merge lp:~vanvugt/compiz/fix-CompOption-templates into lp:compiz/0.9.9

[Daniel van Vugt]

Instantiate CompOption-related templates in core only. There's no need for
duplicates to be instantiated in plugins too.
(LP: #1066793) (LP: #1066803)

This not only reduces build times and will improve stability during plugin
reloads, but it also reduces the footprint of lib/compiz/* from 89MB to 75MB!

[Sam Spilsbury (smspillaz)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3418
http://jenkins.qa.ubuntu.com/job/compiz-ci/185/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-ci/./build=pbuilder,distribution=quantal,flavor=amd64/185/console

review: Approve (continuous-integration)

=== modified file 'include/core/option.h'
--- include/core/option.h	2012-10-02 05:51:26 +0000
+++ include/core/option.h	2012-10-16 03:41:20 +0000
@@ -302,6 +302,10 @@
 	PrivateOption *priv;
 };
 
+extern template class std::vector<unsigned short>;
+extern template class std::vector<CompOption::Value>;
+extern template class std::vector<CompOption>;
+
 namespace compiz {
 namespace detail {
 

=== modified file 'src/option.cpp'
--- src/option.cpp	2012-10-02 05:51:26 +0000
+++ src/option.cpp	2012-10-16 03:41:20 +0000
@@ -38,6 +38,10 @@
 #include <boost/variant/static_visitor.hpp>
 #include <boost/type_traits/remove_const.hpp>
 
+template class std::vector<unsigned short>;
+template class std::vector<CompOption::Value>;
+template class std::vector<CompOption>;
+
 namespace
 {
     CompOption::Value::Vector & emptyList ()