[llvm-commits] [llvm] r47372 - in /llvm/trunk: include/llvm/LinkTimeOptimizer.h lib/Linker/LinkModules.cpp tools/llvm-db/Commands.cpp

[Anton Korobeynikov]

Author: asl
Date: Wed Feb 20 05:27:04 2008
New Revision: 47372

URL: http://llvm.org/viewvc/llvm-project?rev=47372&view=rev
Log:
And final pack of warnings silencing

Modified:
    llvm/trunk/include/llvm/LinkTimeOptimizer.h
    llvm/trunk/lib/Linker/LinkModules.cpp
    llvm/trunk/tools/llvm-db/Commands.cpp

Modified: llvm/trunk/include/llvm/LinkTimeOptimizer.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/LinkTimeOptimizer.h?rev=47372&r1=47371&r2=47372&view=diff

==============================================================================
--- llvm/trunk/include/llvm/LinkTimeOptimizer.h (original)
+++ llvm/trunk/include/llvm/LinkTimeOptimizer.h Wed Feb 20 05:27:04 2008
@@ -19,6 +19,7 @@
 #include <vector>
 #include <set>
 #include <llvm/ADT/hash_map>
+#include <cstring>
 
 #define LLVM_LTO_VERSION 2
 

Modified: llvm/trunk/lib/Linker/LinkModules.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Linker/LinkModules.cpp?rev=47372&r1=47371&r2=47372&view=diff

==============================================================================
--- llvm/trunk/lib/Linker/LinkModules.cpp (original)
+++ llvm/trunk/lib/Linker/LinkModules.cpp Wed Feb 20 05:27:04 2008
@@ -951,16 +951,19 @@
     } else {
       std::string DataLayout;
 
-      if (Dest->getEndianness() == Module::AnyEndianness)
+      if (Dest->getEndianness() == Module::AnyEndianness) {
         if (Src->getEndianness() == Module::BigEndian)
           DataLayout.append("E");
         else if (Src->getEndianness() == Module::LittleEndian)
           DataLayout.append("e");
-      if (Dest->getPointerSize() == Module::AnyPointerSize)
+      }
+
+      if (Dest->getPointerSize() == Module::AnyPointerSize) {
         if (Src->getPointerSize() == Module::Pointer64)
           DataLayout.append(DataLayout.length() == 0 ? "p:64:64" : "-p:64:64");
         else if (Src->getPointerSize() == Module::Pointer32)
           DataLayout.append(DataLayout.length() == 0 ? "p:32:32" : "-p:32:32");
+      }
       Dest->setDataLayout(DataLayout);
     }
   }

Modified: llvm/trunk/tools/llvm-db/Commands.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-db/Commands.cpp?rev=47372&r1=47371&r2=47372&view=diff

==============================================================================
--- llvm/trunk/tools/llvm-db/Commands.cpp (original)
+++ llvm/trunk/tools/llvm-db/Commands.cpp Wed Feb 20 05:27:04 2008
@@ -21,6 +21,7 @@
 #include "llvm/Support/FileUtilities.h"
 #include "llvm/ADT/StringExtras.h"
 #include <iostream>
+#include <cstdlib>
 using namespace llvm;
 
 /// getCurrentLanguage - Return the current source language that the user is
@@ -448,11 +449,12 @@
   unsigned CurFrame = RI.getCurrentFrameIdx();
 
   // Check to see if we can go up the specified number of frames.
-  if (CurFrame < Num)
+  if (CurFrame < Num) {
     if (Num == 1)
       throw "Bottom (i.e., innermost) frame selected; you cannot go down.";
     else
       throw "Cannot go down " + utostr(Num) + " frames!";
+  }
 
   RI.setCurrentFrameIdx(CurFrame-Num);
   printProgramLocation();