Skip to content

Commit 92b9cc5

Browse files
author
Tor Didriksen
committed
Bug 11886774 - 59611 REMOVE THE PRAGMA INTERFACE/IMPLEMENTATION DECLARATIONS
Remove obsolete pragma interface/implementation and associated ifdefs/macros.
1 parent 1d5ca80 commit 92b9cc5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+0
-373
lines changed

‎client/sql_string.cc‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,6 @@
1515

1616
/* This file is originally from the mysql distribution. Coded by monty */
1717

18-
#ifdef USE_PRAGMA_IMPLEMENTATION
19-
#pragma implementation // gcc: Class implementation
20-
#endif
21-
2218
#include <my_global.h>
2319
#include <my_sys.h>
2420
#include <m_string.h>

‎client/sql_string.h‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@
1818

1919
/* This file is originally from the mysql distribution. Coded by monty */
2020

21-
#ifdef USE_PRAGMA_INTERFACE
22-
#pragma interface /* gcc class implementation */
23-
#endif
24-
2521
class String;
2622
int sortcmp(const String *a,const String *b, const CHARSET_INFO *cs);
2723
String *copy_if_not_alloced(String *a,String *b,uint32 arg_length);

‎include/my_global.h‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,6 @@
4646
#define HAVE_ERRNO_AS_DEFINE
4747
#endif /* __CYGWIN__ */
4848

49-
/* to make command line shorter we'll define USE_PRAGMA_INTERFACE here */
50-
#ifdef USE_PRAGMA_IMPLEMENTATION
51-
#define USE_PRAGMA_INTERFACE
52-
#endif
53-
5449
#if defined(__OpenBSD__) && (OpenBSD >= 200411)
5550
#define HAVE_ERRNO_AS_DEFINE
5651
#endif

‎sql/debug_sync.h‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,6 @@
2222
Declarations for the Debug Sync Facility. See debug_sync.cc for details.
2323
*/
2424

25-
#ifdef USE_PRAGMA_INTERFACE
26-
#pragma interface /* gcc class implementation */
27-
#endif
28-
2925
#include <my_global.h>
3026

3127
class THD;

‎sql/field.cc‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,6 @@
2121
This file implements classes defined in field.h
2222
*/
2323

24-
#ifdef USE_PRAGMA_IMPLEMENTATION
25-
#pragma implementation // gcc: Class implementation
26-
#endif
27-
2824
#include "sql_priv.h"
2925
#include "sql_select.h"
3026
#include "rpl_rli.h" // Pull in Relay_log_info

‎sql/field.h‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,6 @@
1616
along with this program; if not, write to the Free Software
1717
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
1818

19-
#ifdef USE_PRAGMA_INTERFACE
20-
#pragma interface /* gcc class implementation */
21-
#endif
22-
2319
#include "mysqld.h" /* system_charset_info */
2420
#include "table.h" /* TABLE */
2521
#include "sql_string.h" /* String */

‎sql/ha_ndbcluster.cc‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,6 @@
2121
MySQL and NDB Cluster
2222
*/
2323

24-
#ifdef USE_PRAGMA_IMPLEMENTATION
25-
#pragma implementation // gcc: Class implementation
26-
#endif
27-
2824
#include "sql_priv.h"
2925
#include "unireg.h" // REQUIRED: for other includes
3026
#include "sql_table.h" // build_table_filename,

‎sql/ha_ndbcluster.h‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,6 @@
2323

2424
/* The class defining a handle to an NDB Cluster table */
2525

26-
#ifdef USE_PRAGMA_INTERFACE
27-
#pragma interface /* gcc class implementation */
28-
#endif
29-
3026
/* Blob tables and events are internal to NDB and must never be accessed */
3127
#define IS_NDB_BLOB_PREFIX(A) is_prefix(A, "NDB$BLOB")
3228

‎sql/ha_ndbcluster_cond.cc‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,6 @@
1717
This file defines the NDB Cluster handler engine_condition_pushdown
1818
*/
1919

20-
#ifdef USE_PRAGMA_IMPLEMENTATION
21-
#pragma implementation // gcc: Class implementation
22-
#endif
23-
2420
#include "sql_priv.h"
2521
#include "sql_class.h" // set_var.h: THD
2622
#include "my_global.h" // WITH_*

‎sql/ha_ndbcluster_cond.h‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,6 @@
2121
the NDB Cluster handler
2222
*/
2323

24-
#ifdef USE_PRAGMA_INTERFACE
25-
#pragma interface /* gcc class implementation */
26-
#endif
27-
2824
/*
2925
It is necessary to include set_var.h instead of item.h because there
3026
are dependencies on include order for set_var.h and item.h. This

0 commit comments

Comments
 (0)