Export ValueSet base classes for use in DLL

Mark friend operator in Enum class as inline to prevent duplication

Author: langmm

include/ValueSet.hpp

@@ -714,7 +714,7 @@ namespace ePhotosynthesis {
      Untemplated base class to allow storage of mixed value sets in
        containers.
    */
-  class ValueSet_t {
+  class EPHOTO_API ValueSet_t {
   public:
 
     virtual ~ValueSet_t() {}
@@ -889,7 +889,7 @@ namespace ePhotosynthesis {
        will be used by.
    */
   template<class T, class U, MODULE ID, PARAM_TYPE PT>
-  class ValueSetBase : public ValueSetEnum<ID, PT> {
+  class EPHOTO_API ValueSetBase : public ValueSetEnum<ID, PT> {
   public:
     typedef T ThisClass; /** Inheriting class */
     typedef U ThisParent; /** Parent class */

include/enums/enums.hpp

@@ -2,6 +2,7 @@
 // modified directly
 #pragma once
 
+#include "ePhotosynthesis_export.h"
 #include <string>
 #include <map>
 #include <vector>
@@ -243,7 +244,7 @@ namespace ePhotosynthesis {
   };
   #endif // EPHOTO_USE_SCOPED_ENUM
   template<MODULE M, PARAM_TYPE PT>
-  class ValueSetEnum {
+  class EPHOTO_API ValueSetEnum {
   public:
     #ifdef EPHOTO_USE_SCOPED_ENUM
     typedef typename enum_helper<M, PT>::type Type;
@@ -282,7 +283,7 @@ namespace ePhotosynthesis {
       \param[in] x Key to serialize
       \return Updated stream
     */
-    friend std::ostream& operator<<(std::ostream& out, const Type& x) {
+    friend inline std::ostream& operator<<(std::ostream& out, const Type& x) {
       out << getName(x);
       return out;
     }
@@ -292,7 +293,7 @@ namespace ePhotosynthesis {
       \param[in] x Collection to serialize
       \return Updated stream
     */
-    friend std::ostream& operator<<(std::ostream& out, const std::map<Type, std::string>& x) {
+    friend inline std::ostream& operator<<(std::ostream& out, const std::map<Type, std::string>& x) {
       print_map(x, out);
       return out;
     }
@@ -607,7 +608,7 @@ namespace ePhotosynthesis {
       \param[in] x Collection to serialize
       \return Updated stream
     */
-    friend std::ostream& operator<<(std::ostream& out, const std::vector<Type>& x) {
+    friend inline std::ostream& operator<<(std::ostream& out, const std::vector<Type>& x) {
       print_vector(x, out);
       return out;
     }

utils/generate_enum.py

@@ -1477,7 +1477,7 @@ def generate_additional_method(self, function_type, enum_name='Type',
             lines += ['*/']
         static = 'static'
         if function_type in ['operator<<']:
-            static = 'friend'
+            static = 'friend inline'
         lines += [f"{static} {return_type} {function_name}"
                   f"({', '.join(args)}) {{"]
         lines += ["  " + x for x in body]
@@ -1779,6 +1779,7 @@ class CEnumGeneratorGlobalHeader(CEnumGeneratorBase):
     name = 'global'
     file_suffix = ''
     prefix = CEnumGeneratorBase.prefix + [
+        '#include "ePhotosynthesis_export.h"',
         '#include <string>',
         '#include <map>',
         '#include <vector>',
@@ -2424,7 +2425,7 @@ def generate_declaration(self, name, members, enum_name=None,
             lines += ['#endif // EPHOTO_USE_SCOPED_ENUM']
         lines += template_lines
         lines += [
-            f'class {class_name}{specialization} {{',
+            f'class EPHOTO_API {class_name}{specialization} {{',
             'public:',
         ]
         lines += [