Add ifdefs to control when "#pragma implementation" should be used

Added some more ifdefs for "#pragma interface"

client/sql_string.cc

@@ -16,7 +16,7 @@
 
 /* This file is originally from the mysql distribution. Coded by monty */
 
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
 

client/sql_string.h

@@ -16,7 +16,7 @@
 
 /* This file is originally from the mysql distribution. Coded by monty */
 
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_INTERFACE
 #pragma interface			/* gcc class implementation */
 #endif
 

include/my_global.h

@@ -48,6 +48,11 @@
 #define USE_PRAGMA_INTERFACE
 #endif
 
+/* Determine when to use "#pragma implementation" */
+#if !defined(__INTEL_COMPILER) && defined(__GNUC__) && (__GNUC__ < 3)
+#define USE_PRAGMA_IMPLEMENTATION
+#endif
+
 #if defined(i386) && !defined(__i386__)
 #define __i386__
 #endif

mysys/raid.cc

@@ -70,7 +70,7 @@
    tonu@mysql.com & monty@mysql.com
 */
 
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_IMPLEMENTATION 
 #pragma implementation				// gcc: Class implementation
 #endif
 

sql/field.cc

@@ -19,7 +19,7 @@
 ** This file implements classes defined in field.h
 *****************************************************************************/
 
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
 

sql/ha_berkeley.cc

@@ -47,7 +47,7 @@
 */
 
 
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
 

sql/ha_blackhole.cc

@@ -15,7 +15,7 @@
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation        // gcc: Class implementation
 #endif
 

sql/ha_heap.cc

@@ -15,7 +15,7 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
 

sql/ha_innodb.cc

@@ -28,7 +28,7 @@ have disables the InnoDB inlining in this file. */
     in Windows?
 */
 
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
 

sql/ha_isam.cc

@@ -15,7 +15,7 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation			// gcc: Class implementation
 #endif
 

sql/ha_isammrg.cc

@@ -15,7 +15,7 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
 

sql/ha_myisam.cc

@@ -15,7 +15,7 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
 

sql/ha_myisammrg.cc

@@ -15,7 +15,7 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
 

sql/ha_ndbcluster.cc

@@ -20,7 +20,7 @@
   NDB Cluster
 */
 
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation                          // gcc: Class implementation
 #endif
 

sql/handler.cc

@@ -17,7 +17,7 @@
 
 /* Handler-calling-functions */
 
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
 

sql/hash_filo.cc

@@ -20,7 +20,7 @@
 ** to usage.
 */
 
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
 

sql/item.cc

@@ -15,7 +15,7 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
 

sql/item_cmpfunc.cc

@@ -17,7 +17,7 @@
 
 /* This file defines all compare functions */
 
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
 

sql/item_func.cc

@@ -17,7 +17,7 @@
 
 /* This file defines all numerical functions */
 
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
 

sql/item_geofunc.cc

@@ -17,7 +17,7 @@
 
 /* This file defines all spatial functions */
 
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
 

sql/item_strfunc.cc

@@ -20,7 +20,7 @@
 ** (This shouldn't be needed)
 */
 
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
 

sql/item_subselect.cc

@@ -22,7 +22,7 @@ SUBSELECT TODO:
      (sql_select.h/sql_select.cc)
 */
 
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
 

sql/item_sum.cc

@@ -17,7 +17,7 @@
 
 /* Sum functions (COUNT, MIN...) */
 
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
 

sql/item_timefunc.cc

@@ -17,7 +17,7 @@
 
 /* This file defines all time functions */
 
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
 

sql/item_uniq.cc

@@ -15,7 +15,7 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 /* Compability file */
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation
 #endif
 

sql/item_uniq.h

@@ -16,7 +16,7 @@
 
 /* Compability file ; This file only contains dummy functions */
 
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_INTERFACE
 #pragma interface
 #endif
 

sql/log_event.cc

@@ -16,7 +16,7 @@
 
 
 #ifndef MYSQL_CLIENT
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
 #include  "mysql_priv.h"

sql/log_event.h

@@ -22,7 +22,7 @@
 #undef write  // remove pthread.h macro definition, conflict with write() class member
 #endif
 
-#if defined(__GNUC__) && !defined(MYSQL_CLIENT)
+#if defined(USE_PRAGMA_INTERFACE) && !defined(MYSQL_CLIENT)
 #pragma interface			/* gcc class implementation */
 #endif
 

sql/opt_range.cc

@@ -23,7 +23,7 @@
 
 */
 
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
 

sql/procedure.cc

@@ -17,7 +17,7 @@
 
 /* Procedures (functions with changes output of select) */
 
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
 

sql/protocol.cc

@@ -19,7 +19,7 @@
   The actual communction is handled by the net_xxx functions in net_serv.cc
 */
 
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
 

sql/protocol_cursor.cc

@@ -19,7 +19,7 @@
   The actual communction is handled by the net_xxx functions in net_serv.cc
 */
 
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
 

sql/set_var.cc

@@ -48,7 +48,7 @@
       new attribute.
 */
 
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
 

sql/sql_analyse.cc

@@ -23,7 +23,7 @@
 **	 - type set is out of optimization yet
 */
 
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
 

sql/sql_analyse.h

@@ -17,7 +17,7 @@
 
 /* Analyse database */
 
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_INTERFACE
 #pragma interface				/* gcc class implementation */
 #endif
 

sql/sql_class.cc

@@ -22,7 +22,7 @@
 **
 *****************************************************************************/
 
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
 

sql/sql_crypt.cc

@@ -23,7 +23,7 @@
  needs something like 'ssh'.
 */
 
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
 

sql/sql_crypt.h

@@ -15,7 +15,7 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_INTERFACE 
 #pragma interface			/* gcc class implementation */
 #endif
 

sql/sql_list.cc

@@ -15,7 +15,7 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
 

sql/sql_map.cc

@@ -15,7 +15,7 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
 

sql/sql_map.h

@@ -17,7 +17,7 @@
 
 /* interface for memory mapped files */
 
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_INTERFACE 
 #pragma interface			/* gcc class implementation */
 #endif
 

sql/sql_olap.cc

@@ -28,7 +28,7 @@
 
 #ifdef DISABLED_UNTIL_REWRITTEN_IN_4_1
 
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
 

sql/sql_select.cc

@@ -17,7 +17,7 @@
 
 /* mysql_select and join optimization */
 
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
 

sql/sql_string.cc

@@ -16,7 +16,7 @@
 
 /* This file is originally from the mysql distribution. Coded by monty */
 
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
 

sql/sql_udf.cc

@@ -28,7 +28,7 @@
 ** dynamic functions, so this shouldn't be a real problem.
 */
 
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: implement sql_udf.h
 #endif
 

sql/tztime.cc

@@ -20,7 +20,7 @@
    (We will refer to this code as to elsie-code further.)
 */
 
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif