Revert "Merge pull request RPCS3#1238 from tambry/CoverityFix"

This reverts commit f898ebf, reversing
changes made to f677782.

.travis.yml

@@ -13,10 +13,6 @@ compiler:
 env:
   global:
    - secure: "jA29KvTCTR7q4BMzPPUBGazjJwrIWa7k4fo5ZSMlyxh2NbztZTKQYwodgDcXBoptCd1KJ9H3FXwBnNdMNVnTkvoPL9uWnN4K/3D1D20FCag1kmlBwnaVqVei5cRiZ9TOMuaxhjkdg8pcrQLTlXEEdMZf6A2OW0VgoBGDVSX9nYc="
-   # Which Travis environment to run Coverity on
-   - coverity_scan_run_condition='"$CC" = gcc -a "$TRAVIS_OS_NAME" != osx'
-   # Test mode is for testing if it's working with Coverity. Change to true if testing, to avoid reaching the quota.
-   - coverity_scan_script_test_mode=false
 
 branches:
   except:
@@ -41,7 +37,9 @@ before_install:
       sudo /etc/init.d/couchdb stop;
       sudo /etc/init.d/redis-server stop;
       sudo free -m -t;
+    fi;
 
+  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then
       echo "yes" | sudo apt-key adv --fetch-keys 'http://repos.codelite.org/CodeLite.asc';
       echo "yes" | sudo apt-add-repository 'deb http://repos.codelite.org/wx3.0/ubuntu/ precise universe';
       echo "yes" | sudo add-apt-repository 'deb http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu precise main';
@@ -80,25 +78,27 @@ before_script:
  - cd build
  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then cmake ..; else cmake .. -DLLVM_DIR=/usr/local/opt/llvm36/lib/llvm-3.6/share/llvm/cmake; fi
 
-script:
-# Add a command to show all the variables. May be useful for debugging Travis.
-# - echo "--Shell Export Lists START--" ; export -p; echo "--Shell Export Lists STOP--";
-# And to ensure the versions of toolchain
-- echo "--CXX version?"; "$CXX" --version; echo "--CXX version confirmed";
-- if [ "$COVERITY_SCAN_BRANCH" != 1 ]; then make -j 4; fi
-
 addons:
   coverity_scan:
     project:
-      name: $TRAVIS_REPO_SLUG
+      name: "DHrpcs3/rpcs3"
+      description: "PS3 emulator/debugger"
     notification_email: raul.tambre@gmail.com
     build_command_prepend: ""
     build_command:   "make -j 4"
-    branch_pattern: master
+    branch_pattern: coverity_scan
 
+# These modifys are from https://github.com/devernay/cminpack/blob/master/.travis.yml
+# It passed but when coverall it failed.
+script:
+# Add a command to show all the variables now. maybe only useful for debugging travis.
+# - echo "--Shell Export Lists START--" ; export -p; echo "--Shell Export Lists STOP--";
+# And to ensure the versions of toolchain
+ - echo "--CXX version?"; "$CXX" --version; echo "--CXX version confirmed";
+# From https://github.com/devernay/cminpack/blob/master/.travis.yml: that is $COVERITY_SCAN_BRANCH not ${COVERITY_SCAN_BRANCH}
+ - if [ "$COVERITY_SCAN_BRANCH" != 1 ]; then make -j 4; fi
 after_success:
-- coveralls --extension .c --extension .cpp --extension .h;
-
+ - if [ "$COVERITY_SCAN_BRANCH" != 1 ]; then coveralls --extension .c --extension .cpp --extension .h; fi
 after_failure:
 # show memory usage again and show actions of the OOM killer
  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then

rpcs3/stdafx.h

@@ -169,7 +169,7 @@ template<typename T1, typename T2, typename T3 = const char*> struct triplet_t
 template<typename T> struct id_traits;
 
 #define _PRGNAME_ "RPCS3"
-#define _PRGVER_ "0.0.0.6"
+#define _PRGVER_ "0.0.0.5"
 
 #include "Utilities/BEType.h"
 #include "Utilities/Atomic.h"