Resolving warning: #2524-D: #pragma pop with no matching #pragma push : Pragma push for CC_ARM option is inside GNUC define, same hierarchy to be followed while pop

pull/4760/head
Deepika 2017-06-15 12:07:02 -05:00 committed by adbridge
parent b703283cb7
commit 9ec78bf177
2 changed files with 6 additions and 4 deletions

View File

@ -2734,11 +2734,12 @@ void flash_cache_clear(flash_config_t *config)
__DSB(); __DSB();
#endif /* FLASH_DRIVER_IS_FLASH_RESIDENT */ #endif /* FLASH_DRIVER_IS_FLASH_RESIDENT */
} }
#if (defined(__GNUC__))
/* #pragma GCC pop_options */
#else
#if (defined(__CC_ARM)) #if (defined(__CC_ARM))
#pragma pop #pragma pop
#endif #endif
#if (defined(__GNUC__))
/* #pragma GCC pop_options */
#endif #endif
#if FLASH_DRIVER_IS_FLASH_RESIDENT #if FLASH_DRIVER_IS_FLASH_RESIDENT

View File

@ -2734,11 +2734,12 @@ void flash_cache_clear(flash_config_t *config)
__DSB(); __DSB();
#endif /* FLASH_DRIVER_IS_FLASH_RESIDENT */ #endif /* FLASH_DRIVER_IS_FLASH_RESIDENT */
} }
#if (defined(__GNUC__))
/* #pragma GCC pop_options */
#else
#if (defined(__CC_ARM)) #if (defined(__CC_ARM))
#pragma pop #pragma pop
#endif #endif
#if (defined(__GNUC__))
/* #pragma GCC pop_options */
#endif #endif
#if FLASH_DRIVER_IS_FLASH_RESIDENT #if FLASH_DRIVER_IS_FLASH_RESIDENT