Fix errors after rebase

appveyor.yml

@@ -1,51 +1,44 @@
-version: "Build {build}"
-
-
-cache: c:\tools\vcpkg\installed\
-
-
-skip_commits:
-  message: /\[[aA]ppveyor [sS]kip\]/
-
-
-branches:
-  except:
-    - gh-pages
-
-
-matrix:
-  fast_finish: true
-
-
-pull_requests:
-  do_not_increment_build_number: true
-
-
-clone_folder: C:\projects\boomerang
+#
+# This file is part of the Boomerang Decompiler.
+#
+# See the file "LICENSE.TERMS" for information on usage and
+# redistribution of this file, and for a DISCLAIMER OF ALL
+# WARRANTIES.
+#
 
+version: "Build {build}"
 
 os:
   - Visual Studio 2017
 
-
 platform:
   - x64
 
-
 configuration:
   - Debug
   - Release
 
+branches:
+  except:
+    - gh-pages
+
+skip_commits:
+  message: /\[[aA]ppveyor [sS]kip\]/
+
+clone_folder: C:\projects\boomerang
+
+cache: c:\tools\vcpkg\installed\
 
 build:
   parallel: true
   verbosity: quiet # MSBuild verbosity level (quiet|minimal|normal|detailed)
 
-
-
 matrix:
   fast_finish: true
 
+pull_requests:
+  do_not_increment_build_number: true
+
 init:
   - cmd: cmake --version
   - cmd: msbuild /version
@@ -66,3 +59,4 @@ artifacts:
   - path: 'build\boomerang-*.exe'
     name: Installer
     type: File
+

src/boomerang/frontend/pentium/CapstoneX86Decoder.cpp

@@ -258,7 +258,7 @@ std::unique_ptr<RTL> CapstoneX86Decoder::createRTLForInstruction(Address pc,
             CallStatement *call = new CallStatement;
             // Set the destination
             call->setDest(callDest);
-            rtl->push_back(call);
+            rtl->append(call);
 
             if (callDest->isConst()) {
                 Function *destProc = m_prog->getOrCreateFunction(
@@ -372,8 +372,9 @@ std::unique_ptr<RTL> CapstoneX86Decoder::createRTLForInstruction(Address pc,
         }
 
         rtl->clear();
-        rtl->push_back(bas);
+        rtl->append(bas);
     }
+
     return rtl;
 }