diff options
author | Nicolás Alvarez <nicolas.alvarez@gmail.com> | 2014-09-18 12:49:08 -0300 |
---|---|---|
committer | Nicolás Alvarez <nicolas.alvarez@gmail.com> | 2014-09-18 12:49:08 -0300 |
commit | af146c83f5f7f4c30dbf3cc0beaf5498153b6ea3 (patch) | |
tree | 8dd821496ebcc692d4754efcb1b5f2080a505543 | |
parent | a26008ef6773e3d473fccc8bc8f8aaf902a49121 (diff) | |
download | kconfig-af146c83f5f7f4c30dbf3cc0beaf5498153b6ea3.tar.gz kconfig-af146c83f5f7f4c30dbf3cc0beaf5498153b6ea3.tar.bz2 |
Move diagnostic pragmas outside/around functions.
gcc 4.5 doesn't support "#pragma GCC diagnostic" inside functions.
Apparently it also doesn't support "#pragma GCC diagnostic push/pop",
but it doesn't fail for that, so meh.
-rw-r--r-- | src/core/kcoreconfigskeleton.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/core/kcoreconfigskeleton.cpp b/src/core/kcoreconfigskeleton.cpp index f9c9f268..e4255a60 100644 --- a/src/core/kcoreconfigskeleton.cpp +++ b/src/core/kcoreconfigskeleton.cpp @@ -1105,33 +1105,33 @@ void KCoreConfigSkeleton::usrSetDefaults() { } -void KCoreConfigSkeleton::usrRead() -{ #ifdef Q_CC_GNU #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-declarations" #endif +void KCoreConfigSkeleton::usrRead() +{ usrReadConfig(); +} #ifdef Q_CC_GNU #pragma GCC diagnostic pop #endif -} void KCoreConfigSkeleton::usrReadConfig() { } -bool KCoreConfigSkeleton::usrSave() -{ #ifdef Q_CC_GNU #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-declarations" #endif +bool KCoreConfigSkeleton::usrSave() +{ return usrWriteConfig(); +} #ifdef Q_CC_GNU #pragma GCC diagnostic pop #endif -} bool KCoreConfigSkeleton::usrWriteConfig() { |