Merge pull request #968 from borglab/feature/discrete_wrapper_2

borglab · Dec 16, 2021 · 93978cf · 93978cf
2 parents 6bcd129 + 7401b6e
commit 93978cf
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/gtsam/discrete/DiscreteKey.h b/gtsam/discrete/DiscreteKey.h
@@ -31,24 +31,24 @@ namespace gtsam {
    * Key type for discrete conditionals
    * Includes name and cardinality
    */
-  typedef std::pair<Key,size_t> DiscreteKey;
+  using DiscreteKey = std::pair<Key,size_t>;
 
   /// DiscreteKeys is a set of keys that can be assembled using the & operator
   struct DiscreteKeys: public std::vector<DiscreteKey> {
 
     // Forward all constructors.
     using std::vector<DiscreteKey>::vector;
 
-    /// Get around gcc bug, which does not like above.
-    DiscreteKeys() {}
+    /// Constructor for serialization
+    GTSAM_EXPORT DiscreteKeys() : std::vector<DiscreteKey>::vector() {}
 
     /// Construct from a key
-    DiscreteKeys(const DiscreteKey& key) {
+    GTSAM_EXPORT DiscreteKeys(const DiscreteKey& key) {
       push_back(key);
     }
 
     /// Construct from a vector of keys
-    DiscreteKeys(const std::vector<DiscreteKey>& keys) :
+    GTSAM_EXPORT DiscreteKeys(const std::vector<DiscreteKey>& keys) :
       std::vector<DiscreteKey>(keys) {
     }