Changeset b6640bb in git

Timestamp:

Jul 21, 2021, 11:14:32 AM (3 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

dab56efb2bbceefdd1950479b8958c595100cb88

Parents:

147ec2fa7a6fd5af2304a93a18aca1469bd31b9a1ec51aec27ba0f12b861da32b51a2a50fb66f7e9

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2021-07-21 11:14:32+02:00

git-committer:

GitHub <noreply@github.com>2021-07-21 11:14:32+02:00

Message:

Merge pull request #1109 from mkoeppe/spielwiese

factory/canonicalform.h: Add more FACTORY_PUBLIC

File:

• factory/canonicalform.h (modified) (4 diffs)

factory/canonicalform.h

@@ -173 +173 @@
 
     // comparison operators
-    friend bool operator == ( const CanonicalForm&, const CanonicalForm& );
-    friend bool operator != ( const CanonicalForm&, const CanonicalForm& );
-    friend bool operator > ( const CanonicalForm&, const CanonicalForm& );
-    friend bool operator < ( const CanonicalForm&, const CanonicalForm& );
+    friend FACTORY_PUBLIC bool operator == ( const CanonicalForm&, const CanonicalForm& );
+    friend FACTORY_PUBLIC bool operator != ( const CanonicalForm&, const CanonicalForm& );
+    friend FACTORY_PUBLIC bool operator > ( const CanonicalForm&, const CanonicalForm& );
+    friend FACTORY_PUBLIC bool operator < ( const CanonicalForm&, const CanonicalForm& );
 
     // arithmetic operators
-    friend CF_NO_INLINE CanonicalForm operator - ( const CanonicalForm& );
-
-    friend void FACTORY_PUBLIC divrem ( const CanonicalForm&, const CanonicalForm&, CanonicalForm&, CanonicalForm& );
-    friend bool divremt ( const CanonicalForm&, const CanonicalForm&, CanonicalForm&, CanonicalForm& );
-    friend bool tryDivremt ( const CanonicalForm&, const CanonicalForm&, CanonicalForm&, CanonicalForm&, const CanonicalForm&, bool& );
-
-    friend CanonicalForm bgcd ( const CanonicalForm &, const CanonicalForm & );
-    friend CanonicalForm bextgcd ( const CanonicalForm &, const CanonicalForm &, CanonicalForm &, CanonicalForm & );
+    friend CF_NO_INLINE FACTORY_PUBLIC CanonicalForm operator - ( const CanonicalForm& );
+
+    friend FACTORY_PUBLIC void divrem ( const CanonicalForm&, const CanonicalForm&, CanonicalForm&, CanonicalForm& );
+    friend FACTORY_PUBLIC bool divremt ( const CanonicalForm&, const CanonicalForm&, CanonicalForm&, CanonicalForm& );
+    friend FACTORY_PUBLIC bool tryDivremt ( const CanonicalForm&, const CanonicalForm&, CanonicalForm&, CanonicalForm&, const CanonicalForm&, bool& );
+
+    friend FACTORY_PUBLIC CanonicalForm bgcd ( const CanonicalForm &, const CanonicalForm & );
+    friend FACTORY_PUBLIC CanonicalForm bextgcd ( const CanonicalForm &, const CanonicalForm &, CanonicalForm &, CanonicalForm & );
 
     // input/output
@@ -192 +192 @@
    void print( OSTREAM&, char * ) const;
    void print( OSTREAM& ) const;
-   friend OSTREAM& operator << ( OSTREAM&, const CanonicalForm& );
-   friend ISTREAM& operator >> ( ISTREAM&, CanonicalForm& );
+   friend FACTORY_PUBLIC OSTREAM& operator << ( OSTREAM&, const CanonicalForm& );
+   friend FACTORY_PUBLIC ISTREAM& operator >> ( ISTREAM&, CanonicalForm& );
 #endif /* NOSTREAMIO */
 
@@ -235 +235 @@
 
 //{{{ function declarations from canonicalform.cc
-CanonicalForm blcm ( const CanonicalForm & f, const CanonicalForm & g );
+CanonicalForm FACTORY_PUBLIC blcm ( const CanonicalForm & f, const CanonicalForm & g );
 
 CanonicalForm FACTORY_PUBLIC power ( const CanonicalForm & f, int n );
@@ -245 +245 @@
 CanonicalForm FACTORY_PUBLIC gcd ( const CanonicalForm&, const CanonicalForm& );
 
-CanonicalForm gcd_poly ( const CanonicalForm & f, const CanonicalForm & g );
-
-CanonicalForm lcm ( const CanonicalForm&, const CanonicalForm& );
-
-CanonicalForm pp ( const CanonicalForm& );
-
-CanonicalForm content ( const CanonicalForm& );
-
-CanonicalForm content ( const CanonicalForm&, const Variable& );
-
-CanonicalForm icontent ( const CanonicalForm & f );
-
-CanonicalForm vcontent ( const CanonicalForm & f, const Variable & x );
+CanonicalForm FACTORY_PUBLIC gcd_poly ( const CanonicalForm & f, const CanonicalForm & g );
+
+CanonicalForm FACTORY_PUBLIC lcm ( const CanonicalForm&, const CanonicalForm& );
+
+CanonicalForm FACTORY_PUBLIC pp ( const CanonicalForm& );
+
+CanonicalForm FACTORY_PUBLIC content ( const CanonicalForm& );
+
+CanonicalForm FACTORY_PUBLIC content ( const CanonicalForm&, const Variable& );
+
+CanonicalForm FACTORY_PUBLIC icontent ( const CanonicalForm & f );
+
+CanonicalForm FACTORY_PUBLIC vcontent ( const CanonicalForm & f, const Variable & x );
 //}}}
 
 //{{{ function declarations from cf_ops.cc
-CanonicalForm swapvar ( const CanonicalForm &, const Variable &, const Variable & );
+CanonicalForm FACTORY_PUBLIC swapvar ( const CanonicalForm &, const Variable &, const Variable & );
 
 CanonicalForm FACTORY_PUBLIC replacevar ( const CanonicalForm &, const Variable &, const Variable & );