Removed explicit template instantiation hack. Breaks with current bui…

…ld under Ubuntu 12.04, everything works without it.
libavg · Oct 10, 2017 · b319217 · b319217
1 parent c3464a7
commit b319217
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 67 deletions.
diff --git a/src/player/Arg.cpp b/src/player/Arg.cpp
diff --git a/src/player/Arg.h b/src/player/Arg.h
@@ -94,25 +94,6 @@ ArgBase* Arg<T>::createCopy() const
     return new Arg<T>(*this);
 }
 
-#ifdef AVG_PLUGIN
-#ifdef __linux__
-// Under Linux, templates used by plugins need to be instantiated explicitly if
-// RTTI is needed. Templates instantiated implicitly get instantiated again in the
-// plugin with a different typeid. 
-extern template class Arg<int>;
-extern template class Arg<bool>;
-extern template class Arg<float>;
-extern template class Arg<std::string>;
-extern template class Arg<glm::vec2>;
-extern template class Arg<glm::vec3>;
-extern template class Arg<glm::ivec3>;
-extern template class Arg<std::vector<float> >;
-extern template class Arg<std::vector<int> >;
-extern template class Arg<std::vector<glm::vec2> >;
-extern template class Arg<std::vector<glm::ivec2> >;
-#endif
-#endif
-
 }
 
 #endif

diff --git a/src/player/CMakeLists.txt b/src/player/CMakeLists.txt
@@ -1,5 +1,5 @@
 add_library(player
-    Arg.cpp AreaNode.cpp RasterNode.cpp DivNode.cpp VideoNode.cpp ExportedObject.cpp
+    AreaNode.cpp RasterNode.cpp DivNode.cpp VideoNode.cpp ExportedObject.cpp
     Player.cpp PluginManager.cpp TypeRegistry.cpp ArgBase.cpp ArgList.cpp
     DisplayEngine.cpp Canvas.cpp CanvasNode.cpp OffscreenCanvasNode.cpp
     MainCanvas.cpp Node.cpp MultitouchInputDevice.cpp WrapPython.cpp