diff options
author | dec05eba <dec05eba@protonmail.com> | 2018-01-02 20:08:48 +0100 |
---|---|---|
committer | dec05eba <dec05eba@protonmail.com> | 2018-01-02 20:10:53 +0100 |
commit | fb18bd235bc716963c72c1dd6358176cb50516ae (patch) | |
tree | cda9e38546c0d2a738dd9e2adc7f984d431e6beb /src | |
parent | 8ac9ddf460cc4c1b2972df1069128fb615b31042 (diff) |
Add missing return statement causing segfault
Added compile flags to give error when missing return statement
Diffstat (limited to 'src')
-rw-r--r-- | src/Conf.cpp | 2 | ||||
-rw-r--r-- | src/GlobalLib.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/Conf.cpp b/src/Conf.cpp index 852fcd4..3b0e246 100644 --- a/src/Conf.cpp +++ b/src/Conf.cpp @@ -383,6 +383,7 @@ namespace sibs case PLATFORM_LINUX64: return "linux64"; case PLATFORM_WIN32: return "win32"; case PLATFORM_WIN64: return "win64"; + default: return nullptr; } } @@ -393,6 +394,7 @@ namespace sibs case OPT_LEV_NONE: return "none"; case OPT_LEV_DEBUG: return "debug"; case OPT_LEV_RELEASE: return "release"; + default: return nullptr; } } diff --git a/src/GlobalLib.cpp b/src/GlobalLib.cpp index 3334655..9083354 100644 --- a/src/GlobalLib.cpp +++ b/src/GlobalLib.cpp @@ -183,9 +183,7 @@ namespace sibs if(sibsConfig.shouldUseCmake()) { CmakeModule cmakeModule; - Result<bool> cmakeCompileResult = cmakeModule.compile(sibsConfig, buildPath, staticLinkerFlagCallbackFunc, dynamicLinkerFlagCallbackFunc, globalIncludeDirCallback); - if(!cmakeCompileResult) - return cmakeCompileResult; + return cmakeModule.compile(sibsConfig, buildPath, staticLinkerFlagCallbackFunc, dynamicLinkerFlagCallbackFunc, globalIncludeDirCallback); } else { |