Explicitly instantiate the metadata vectors to avoid linker issues

Auburn · May 9, 2024 · 53cfcd7 · 53cfcd7
1 parent 000bffa
commit 53cfcd7
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/include/FastNoise/Metadata.h b/include/FastNoise/Metadata.h
@@ -30,11 +30,11 @@ namespace FastNoise
         {
         public:
             using const_iterator = const T*;
-            // template solves dll linking when not inlining
-            template<typename = T> const_iterator begin() const { return data() + mStart; }
-            template<typename = T> const_iterator end() const { return data() + mEnd; }
-            template<typename = T> size_t size() const { return mEnd - mStart; }
-            template<typename = T> const T& operator []( size_t i ) const { return begin()[i]; }
+
+            const_iterator begin() const { return data() + mStart; }
+            const_iterator end() const { return data() + mEnd; }
+            size_t size() const { return mEnd - mStart; }
+            const T& operator []( size_t i ) const { return begin()[i]; }
 
         private:
             template<typename>

diff --git a/src/FastNoise/Metadata.cpp b/src/FastNoise/Metadata.cpp
@@ -79,6 +79,12 @@ void Metadata::Vector<T>::push_back( const T& value )
     mStart = std::min( mStart, mEnd++ );
 }
 
+template class Metadata::Vector<const Metadata*>;
+template class Metadata::Vector<const char*>;
+template class Metadata::Vector<Metadata::MemberVariable>;
+template class Metadata::Vector<Metadata::MemberNodeLookup>;
+template class Metadata::Vector<Metadata::MemberHybrid>;
+
 template<typename T>
 void AddToDataStream( std::vector<uint8_t>& dataStream, T value )
 {