Skip to content

Commit ea1f6c6

Browse files
committed
Fixed clang warnings...
1 parent 7064612 commit ea1f6c6

File tree

1 file changed

+14
-3
lines changed

1 file changed

+14
-3
lines changed

GoogleMock/GoogleMock.h

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333
* @abstract GoogleMock integration for Xcode (XCTest)
3434
*/
3535

36-
#ifndef __GOOGLE_MOCK_H__
37-
#define __GOOGLE_MOCK_H__
36+
#ifndef GOOGLE_MOCK_H
37+
#define GOOGLE_MOCK_H
3838

3939
/* GoogleMock C++ include files */
4040
#ifdef __cplusplus
@@ -45,6 +45,12 @@
4545
#pragma clang diagnostic ignored "-Wvariadic-macros"
4646
#pragma clang diagnostic ignored "-Wc++11-long-long"
4747
#pragma clang diagnostic ignored "-Wc++11-extensions"
48+
#pragma clang diagnostic ignored "-Wreserved-id-macro"
49+
#pragma clang diagnostic ignored "-Wmissing-noreturn"
50+
#pragma clang diagnostic ignored "-Wpadded"
51+
#pragma clang diagnostic ignored "-Wused-but-marked-unused"
52+
#pragma clang diagnostic ignored "-Wdeprecated"
53+
#pragma clang diagnostic ignored "-Wglobal-constructors"
4854
#endif
4955

5056
#include <gmock/gmock.h>
@@ -54,6 +60,11 @@
5460
#pragma clang diagnostic pop
5561
#endif
5662

63+
#ifdef __clang__
64+
#pragma clang diagnostic push
65+
#pragma clang diagnostic ignored "-Wglobal-constructors"
66+
#endif
67+
5768
#endif /* __cplusplus */
5869

59-
#endif /* __GOOGLE_MOCK_H__ */
70+
#endif /* GOOGLE_MOCK_H */

0 commit comments

Comments
 (0)