Changeset b6d7f44 for src

Timestamp:

May 6, 2018, 11:24:17 PM (7 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, with_gc

Children:

01ff4e1, 10cfad9

Parents:

7867eb9

Message:

adjust compiler specific #if

Location:

src

Files:

• Common/utility.h (modified) (2 diffs)
• libcfa/time.c (modified) (4 diffs)
• main.cc (modified) (2 diffs)

src/Common/utility.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu May  3 12:18:31 2018
-// Update Count     : 39
+// Last Modified On : Sun May  6 22:24:16 2018
+// Update Count     : 40
 //
 
@@ -442 +442 @@
 template<typename T>
 inline
-#if __GNUC__ > 4
+#if defined(__GNUC__) && __GNUC__ > 4
 constexpr
 #endif

src/libcfa/time.c

@@ -10 +10 @@
 // Created On       : Tue Mar 27 13:33:14 2018
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat May  5 09:04:51 2018
-// Update Count     : 36
+// Last Modified On : Sun May  6 22:26:00 2018
+// Update Count     : 37
 // 
 
@@ -89 +89 @@
         tm tm;
         gmtime_r( &s, &tm );                                                            // tm_mon <= 11, tm_mday <= 31
+#if defined(__GNUC__) && __GNUC__ >= 7
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wformat-truncation"
+#endif
         snprintf( buf, 9, "%02d/%02d/%02d", tm.tm_year % 99, tm.tm_mon + 1, tm.tm_mday );
+#if defined(__GNUC__) && __GNUC__ >= 7
 #pragma GCC diagnostic pop
+#endif
         return buf;
 } // yy_mm_dd
@@ -100 +104 @@
         tm tm;
         gmtime_r( &s, &tm );                                                            // tm_mon <= 11, tm_mday <= 31
+#if defined(__GNUC__) && __GNUC__ >= 7
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wformat-truncation"
+#endif
         snprintf( buf, 9, "%02d/%02d/%02d", tm.tm_mon + 1, tm.tm_mday, tm.tm_year % 99 );
+#if defined(__GNUC__) && __GNUC__ >= 7
 #pragma GCC diagnostic pop
+#endif
         return buf;
 } // mm_dd_yy
@@ -111 +119 @@
         tm tm;
         gmtime_r( &s, &tm );                                                            // tm_mon <= 11, tm_mday <= 31
+#if defined(__GNUC__) && __GNUC__ >= 7
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wformat-truncation"
+#endif
         snprintf( buf, 9, "%02d/%02d/%02d", tm.tm_mday, tm.tm_mon + 1, tm.tm_year % 99 );
+#if defined(__GNUC__) && __GNUC__ >= 7
 #pragma GCC diagnostic pop
+#endif
         return buf;
 } // dd_mm_yy

src/main.cc

@@ -10 +10 @@
 // Created On       : Fri May 15 23:12:02 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed May  2 14:59:02 2018
-// Update Count     : 490
+// Last Modified On : Sun May  6 22:25:59 2018
+// Update Count     : 491
 //
 
@@ -534 +534 @@
                                 assertf( false, "Unknown option: %s\n", argv[optind - 1] );
                         } // if
-                        #if __GNUC__ < 7
-                        #else
+                        #if defined(__GNUC__) && __GNUC__ >= 7
                                 __attribute__((fallthrough));
                         #endif