You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
gentoo-overlay/sci-chemistry/ghemical/files/3.0.0-fix-gcc9.patch

38 lines
2.0 KiB

This file contains ambiguous Unicode characters!

This file contains ambiguous Unicode characters that may be confused with others in your current locale. If your use case is intentional and legitimate, you can safely ignore this warning. Use the Escape button to highlight these characters.

https://bugs.gentoo.org/687450
project.h:210:14: error: friend declaration of bool ReadGPR_OLD(project&, std::istream&, bool, bool) specifies default arguments and isnt a definition [-fpermissive]
210 | friend bool ReadGPR_OLD(project &, istream &, bool, bool = false); ///< this is for the very old version.
| ^~~~~~~~~~~
--- a/src/project.h
+++ b/src/project.h
@@ -122,6 +122,12 @@
graphical user interface.
*/
+class project;
+bool ReadGPR_OLD(project &, istream &, bool, bool = false);
+bool ReadGPR_v100(project &, istream &, bool, bool = false);
+bool ReadGPR_v110(project &, istream &, bool, bool = false);
+bool ReadGPR(project &, istream &, bool, bool = false);
+
class project :
public custom_transformer_client,
public model
@@ -207,11 +213,11 @@
// methods for file I/O : ReadGPR and WriteGPR are friend functions so that it would be easier to "borrow" them elsewhere...
// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
- friend bool ReadGPR_OLD(project &, istream &, bool, bool = false); ///< this is for the very old version.
- friend bool ReadGPR_v100(project &, istream &, bool, bool = false); ///< this is for the version 1.00.
- friend bool ReadGPR_v110(project &, istream &, bool, bool = false); ///< this is for the version 1.10.
+ friend bool ReadGPR_OLD(project &, istream &, bool, bool); ///< this is for the very old version.
+ friend bool ReadGPR_v100(project &, istream &, bool, bool); ///< this is for the version 1.00.
+ friend bool ReadGPR_v110(project &, istream &, bool, bool); ///< this is for the version 1.10.
/// This is an input function for the v1.11 ghemical file format.
- friend bool ReadGPR(project &, istream &, bool, bool = false);
+ friend bool ReadGPR(project &, istream &, bool, bool);
friend void WriteGPR_v100(project &, ostream &); ///< this is for the version 1.00.
/// This is an output function for the v1.11 ghemical file format.