Changeset 96ef156

Timestamp:

Dec 13, 2024, 5:29:12 PM (4 days ago)

Author:

Michael Brooks <mlbrooks@…>

Branches:

master

Children:

d30c229

Parents:

fb0f04d

Message:

Fix IO stream to be warning-free.

Files:

• libcfa/src/bits/debug.hfa (modified) (1 diff)
• libcfa/src/iostream.hfa (modified) (4 diffs)
• tests/nowarn/.expect/fstream.txt (added)
• tests/nowarn/fstream.cfa (added)

libcfa/src/bits/debug.hfa

@@ -23 +23 @@
         #define __cfaabi_dbg_ctx __PRETTY_FUNCTION__
         #define __cfaabi_dbg_ctx2 , __PRETTY_FUNCTION__
-        #define __cfaabi_dbg_ctx_param const char caller[]
-        #define __cfaabi_dbg_ctx_param2 , const char caller[]
+        #define __cfaabi_dbg_ctx_param __attribute__((unused)) const char caller[]
+        #define __cfaabi_dbg_ctx_param2 , __attribute__((unused)) const char caller[]
         #define __cfaabi_dbg_ctx_fwd caller
         #define __cfaabi_dbg_ctx_fwd2 , caller

libcfa/src/iostream.hfa

@@ -183 +183 @@
 };
 
+// FIXME: Should be an anonymous inner union of _Ostream_Manip.
+// Hoisting manually to work around warning of #294.
+union _Ostream_Manip_Mode {
+        unsigned char all;
+        _Ostream_Flags flags;
+};
+
 forall( T )
 struct _Ostream_Manip {
@@ -188 +195 @@
         int wd, pc;                                                                                     // width, precision: signed for computations
         char base;                                                                                      // numeric base / floating-point style
-        union {
-                unsigned char all;
-                _Ostream_Flags flags;
-        };
+        inline _Ostream_Manip_Mode;
 }; // _Ostream_Manip
 
@@ -459 +463 @@
 } // distribution
 
-forall( T & | sized( T ) )
+// FIXME: `| sized(T)` seems to be working around a bug, but it is logically unnecessary.
+// Including sized(T) causes a warning that is telling us to get rid of it.
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+forall( T & | sized(T) )
 struct _Istream_Manip {
         T & val;                                                                                        // polymorphic base-type
@@ -465 +473 @@
         bool ignore;                                                                            // do not change input argument
 }; // _Istream_Manip
+#pragma GCC diagnostic pop
 
 #define INPUT_FMT_DECL( T ) \