From a9ad04191cb56c42944b17980b8b2bb2afe11ab2 Mon Sep 17 00:00:00 2001 From: Dan Gohman Date: Wed, 12 Aug 2009 22:10:57 +0000 Subject: [PATCH] This void is implicit in C++. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@78848 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/ADT/DenseMap.h | 4 ++-- include/llvm/ExecutionEngine/JITMemoryManager.h | 4 ++-- include/llvm/Support/ErrorHandling.h | 2 +- include/llvm/Support/raw_ostream.h | 4 ++-- include/llvm/Support/type_traits.h | 2 +- include/llvm/System/Disassembler.h | 2 +- .../Interpreter/ExternalFunctions.cpp | 2 +- lib/ExecutionEngine/JIT/Intercept.cpp | 2 +- lib/ExecutionEngine/JIT/JITEmitter.cpp | 4 ++-- lib/ExecutionEngine/JIT/JITMemoryManager.cpp | 4 ++-- lib/Support/ErrorHandling.cpp | 2 +- lib/System/Disassembler.cpp | 2 +- lib/Target/ARM/ARMJITInfo.cpp | 2 +- lib/Target/Mips/AsmPrinter/MipsAsmPrinter.cpp | 2 +- lib/Target/Mips/MipsRegisterInfo.cpp | 2 +- lib/Target/Mips/MipsRegisterInfo.h | 2 +- lib/Target/PIC16/PIC16AsmPrinter.cpp | 2 +- lib/Target/PIC16/PIC16AsmPrinter.h | 2 +- lib/Target/XCore/XCoreInstrInfo.cpp | 2 +- lib/Target/XCore/XCoreInstrInfo.h | 2 +- .../example/mcc16/plugins/PIC16Base/PluginMain.cpp | 14 +++++++------- utils/TableGen/Record.h | 8 ++++---- utils/TableGen/TGParser.cpp | 2 +- 23 files changed, 37 insertions(+), 37 deletions(-) diff --git a/include/llvm/ADT/DenseMap.h b/include/llvm/ADT/DenseMap.h index 79672f996d22..b5862a9f0117 100644 --- a/include/llvm/ADT/DenseMap.h +++ b/include/llvm/ADT/DenseMap.h @@ -426,7 +426,7 @@ class DenseMapIterator { protected: const BucketT *Ptr, *End; public: - DenseMapIterator(void) : Ptr(0), End(0) {} + DenseMapIterator() : Ptr(0), End(0) {} DenseMapIterator(const BucketT *Pos, const BucketT *E) : Ptr(Pos), End(E) { AdvancePastEmptyBuckets(); @@ -470,7 +470,7 @@ class DenseMapIterator { template class DenseMapConstIterator : public DenseMapIterator { public: - DenseMapConstIterator(void) : DenseMapIterator() {} + DenseMapConstIterator() : DenseMapIterator() {} DenseMapConstIterator(const std::pair *Pos, const std::pair *E) : DenseMapIterator(Pos, E) { diff --git a/include/llvm/ExecutionEngine/JITMemoryManager.h b/include/llvm/ExecutionEngine/JITMemoryManager.h index 45390115714e..21dee553474c 100644 --- a/include/llvm/ExecutionEngine/JITMemoryManager.h +++ b/include/llvm/ExecutionEngine/JITMemoryManager.h @@ -41,11 +41,11 @@ class JITMemoryManager { /// setMemoryWritable - When code generation is in progress, /// the code pages may need permissions changed. - virtual void setMemoryWritable(void) = 0; + virtual void setMemoryWritable() = 0; /// setMemoryExecutable - When code generation is done and we're ready to /// start execution, the code pages may need permissions changed. - virtual void setMemoryExecutable(void) = 0; + virtual void setMemoryExecutable() = 0; /// setPoisonMemory - Setting this flag to true makes the memory manager /// garbage values over freed memory. This is useful for testing and diff --git a/include/llvm/Support/ErrorHandling.h b/include/llvm/Support/ErrorHandling.h index dccdf9b29cfc..159a3c5d16a5 100644 --- a/include/llvm/Support/ErrorHandling.h +++ b/include/llvm/Support/ErrorHandling.h @@ -45,7 +45,7 @@ namespace llvm { /// Restores default error handling behaviour. /// This must not be called between llvm_start_multithreaded() and /// llvm_stop_multithreaded(). - void llvm_remove_error_handler(void); + void llvm_remove_error_handler(); /// Reports a serious error, calling any installed error handler. /// If no error handler is installed the default is to print the message to diff --git a/include/llvm/Support/raw_ostream.h b/include/llvm/Support/raw_ostream.h index 5f6578fcb505..f7fbe21ee3f5 100644 --- a/include/llvm/Support/raw_ostream.h +++ b/include/llvm/Support/raw_ostream.h @@ -250,8 +250,8 @@ class raw_ostream { void error_detected() { Error = true; } typedef char * iterator; - iterator begin(void) { return OutBufStart; } - iterator end(void) { return OutBufCur; } + iterator begin() { return OutBufStart; } + iterator end() { return OutBufCur; } //===--------------------------------------------------------------------===// // Private Interface diff --git a/include/llvm/Support/type_traits.h b/include/llvm/Support/type_traits.h index 32736b4141c8..71f7655e2efe 100644 --- a/include/llvm/Support/type_traits.h +++ b/include/llvm/Support/type_traits.h @@ -35,7 +35,7 @@ namespace dont_use // important to make the is_class::value idiom zero cost. it // evaluates to a constant 1 or 0 depending on whether the // parameter T is a class or not (respectively). - template char is_class_helper(void(T::*)(void)); + template char is_class_helper(void(T::*)()); template double is_class_helper(...); } diff --git a/include/llvm/System/Disassembler.h b/include/llvm/System/Disassembler.h index d1d8a81007e3..6d1cc0fdcb50 100644 --- a/include/llvm/System/Disassembler.h +++ b/include/llvm/System/Disassembler.h @@ -23,7 +23,7 @@ namespace sys { /// This function returns true, if there is possible to use some external /// disassembler library. False otherwise. -bool hasDisassembler(void); +bool hasDisassembler(); /// This function provides some "glue" code to call external disassembler /// libraries. diff --git a/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp b/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp index 68097fd12196..37f6ef07f6de 100644 --- a/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp +++ b/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp @@ -55,7 +55,7 @@ static ManagedStatic > ExportedFunctions; static std::map FuncNames; #ifdef USE_LIBFFI -typedef void (*RawFunc)(void); +typedef void (*RawFunc)(); static ManagedStatic > RawFunctions; #endif diff --git a/lib/ExecutionEngine/JIT/Intercept.cpp b/lib/ExecutionEngine/JIT/Intercept.cpp index 33143394f4cd..f1e900f63b18 100644 --- a/lib/ExecutionEngine/JIT/Intercept.cpp +++ b/lib/ExecutionEngine/JIT/Intercept.cpp @@ -85,7 +85,7 @@ static void jit_exit(int Status) { } // jit_atexit - Used to intercept the "atexit" library call. -static int jit_atexit(void (*Fn)(void)) { +static int jit_atexit(void (*Fn)()) { AtExitHandlers.push_back(Fn); // Take note of atexit handler... return 0; // Always successful } diff --git a/lib/ExecutionEngine/JIT/JITEmitter.cpp b/lib/ExecutionEngine/JIT/JITEmitter.cpp index c3e16510b460..23321260f269 100644 --- a/lib/ExecutionEngine/JIT/JITEmitter.cpp +++ b/lib/ExecutionEngine/JIT/JITEmitter.cpp @@ -606,11 +606,11 @@ namespace { if (DwarfExceptionHandling) DE->setModuleInfo(Info); } - void setMemoryExecutable(void) { + void setMemoryExecutable() { MemMgr->setMemoryExecutable(); } - JITMemoryManager *getMemMgr(void) const { return MemMgr; } + JITMemoryManager *getMemMgr() const { return MemMgr; } private: void *getPointerToGlobal(GlobalValue *GV, void *Reference, bool NoNeedStub); diff --git a/lib/ExecutionEngine/JIT/JITMemoryManager.cpp b/lib/ExecutionEngine/JIT/JITMemoryManager.cpp index 3f38f9c241a7..f40e67d90c12 100644 --- a/lib/ExecutionEngine/JIT/JITMemoryManager.cpp +++ b/lib/ExecutionEngine/JIT/JITMemoryManager.cpp @@ -521,14 +521,14 @@ namespace { /// setMemoryWritable - When code generation is in progress, /// the code pages may need permissions changed. - void setMemoryWritable(void) + void setMemoryWritable() { for (unsigned i = 0, e = CodeSlabs.size(); i != e; ++i) sys::Memory::setWritable(CodeSlabs[i]); } /// setMemoryExecutable - When code generation is done and we're ready to /// start execution, the code pages may need permissions changed. - void setMemoryExecutable(void) + void setMemoryExecutable() { for (unsigned i = 0, e = CodeSlabs.size(); i != e; ++i) sys::Memory::setExecutable(CodeSlabs[i]); diff --git a/lib/Support/ErrorHandling.cpp b/lib/Support/ErrorHandling.cpp index 81669223b052..3467fe702b60 100644 --- a/lib/Support/ErrorHandling.cpp +++ b/lib/Support/ErrorHandling.cpp @@ -35,7 +35,7 @@ void llvm_install_error_handler(llvm_error_handler_t handler, ErrorHandlerUserData = user_data; } -void llvm_remove_error_handler(void) { +void llvm_remove_error_handler() { ErrorHandler = 0; } diff --git a/lib/System/Disassembler.cpp b/lib/System/Disassembler.cpp index 378fe262bc10..bad427a58d8c 100644 --- a/lib/System/Disassembler.cpp +++ b/lib/System/Disassembler.cpp @@ -26,7 +26,7 @@ using namespace llvm; -bool llvm::sys::hasDisassembler(void) +bool llvm::sys::hasDisassembler() { #if defined (__i386__) || defined (__amd64__) || defined (__x86_64__) // We have option to enable udis86 library. diff --git a/lib/Target/ARM/ARMJITInfo.cpp b/lib/Target/ARM/ARMJITInfo.cpp index 10c765cec2c5..a3866c8bd6a5 100644 --- a/lib/Target/ARM/ARMJITInfo.cpp +++ b/lib/Target/ARM/ARMJITInfo.cpp @@ -51,7 +51,7 @@ static TargetJITInfo::JITCompilerFn JITCompilerFunction; // control over register saving and restoring. extern "C" { #if defined(__arm__) - void ARMCompilationCallback(void); + void ARMCompilationCallback(); asm( ".text\n" ".align 2\n" diff --git a/lib/Target/Mips/AsmPrinter/MipsAsmPrinter.cpp b/lib/Target/Mips/AsmPrinter/MipsAsmPrinter.cpp index bcdbe008d6c0..010a299bc1ee 100644 --- a/lib/Target/Mips/AsmPrinter/MipsAsmPrinter.cpp +++ b/lib/Target/Mips/AsmPrinter/MipsAsmPrinter.cpp @@ -74,7 +74,7 @@ namespace { void printSavedRegsBitmask(MachineFunction &MF); void printHex32(unsigned int Value); - const char *emitCurrentABIString(void); + const char *emitCurrentABIString(); void emitFunctionStart(MachineFunction &MF); void emitFunctionEnd(MachineFunction &MF); void emitFrameDirective(MachineFunction &MF); diff --git a/lib/Target/Mips/MipsRegisterInfo.cpp b/lib/Target/Mips/MipsRegisterInfo.cpp index 1176b42b48e8..51fbf84b0ea3 100644 --- a/lib/Target/Mips/MipsRegisterInfo.cpp +++ b/lib/Target/Mips/MipsRegisterInfo.cpp @@ -86,7 +86,7 @@ getRegisterNumbering(unsigned RegEnum) return 0; // Not reached } -unsigned MipsRegisterInfo::getPICCallReg(void) { return Mips::T9; } +unsigned MipsRegisterInfo::getPICCallReg() { return Mips::T9; } //===----------------------------------------------------------------------===// // Callee Saved Registers methods diff --git a/lib/Target/Mips/MipsRegisterInfo.h b/lib/Target/Mips/MipsRegisterInfo.h index 808e995b4ed3..fdb8cd026af0 100644 --- a/lib/Target/Mips/MipsRegisterInfo.h +++ b/lib/Target/Mips/MipsRegisterInfo.h @@ -34,7 +34,7 @@ struct MipsRegisterInfo : public MipsGenRegisterInfo { static unsigned getRegisterNumbering(unsigned RegEnum); /// Get PIC indirect call register - static unsigned getPICCallReg(void); + static unsigned getPICCallReg(); /// Adjust the Mips stack frame. void adjustMipsStackFrame(MachineFunction &MF) const; diff --git a/lib/Target/PIC16/PIC16AsmPrinter.cpp b/lib/Target/PIC16/PIC16AsmPrinter.cpp index a981d8375249..1cd64f616fc5 100644 --- a/lib/Target/PIC16/PIC16AsmPrinter.cpp +++ b/lib/Target/PIC16/PIC16AsmPrinter.cpp @@ -194,7 +194,7 @@ static bool is_duplicate(const char *s1, const char *s2) { /// printLibcallDecls - print the extern declarations for compiler /// intrinsics. /// -void PIC16AsmPrinter::printLibcallDecls(void) { +void PIC16AsmPrinter::printLibcallDecls() { // If no libcalls used, return. if (LibcallDecls.empty()) return; diff --git a/lib/Target/PIC16/PIC16AsmPrinter.h b/lib/Target/PIC16/PIC16AsmPrinter.h index b7a50a9befce..3eea880a20a8 100644 --- a/lib/Target/PIC16/PIC16AsmPrinter.h +++ b/lib/Target/PIC16/PIC16AsmPrinter.h @@ -56,7 +56,7 @@ namespace llvm { void EmitRemainingAutos (); void EmitRomData (Module &M); void EmitFunctionFrame(MachineFunction &MF); - void printLibcallDecls(void); + void printLibcallDecls(); protected: bool doInitialization(Module &M); bool doFinalization(Module &M); diff --git a/lib/Target/XCore/XCoreInstrInfo.cpp b/lib/Target/XCore/XCoreInstrInfo.cpp index 4dc307bc2f94..9461e20b3a37 100644 --- a/lib/Target/XCore/XCoreInstrInfo.cpp +++ b/lib/Target/XCore/XCoreInstrInfo.cpp @@ -37,7 +37,7 @@ namespace XCore { using namespace llvm; -XCoreInstrInfo::XCoreInstrInfo(void) +XCoreInstrInfo::XCoreInstrInfo() : TargetInstrInfoImpl(XCoreInsts, array_lengthof(XCoreInsts)), RI(*this) { } diff --git a/lib/Target/XCore/XCoreInstrInfo.h b/lib/Target/XCore/XCoreInstrInfo.h index c8229863898f..c97e6b4d2872 100644 --- a/lib/Target/XCore/XCoreInstrInfo.h +++ b/lib/Target/XCore/XCoreInstrInfo.h @@ -22,7 +22,7 @@ namespace llvm { class XCoreInstrInfo : public TargetInstrInfoImpl { const XCoreRegisterInfo RI; public: - XCoreInstrInfo(void); + XCoreInstrInfo(); /// getRegisterInfo - TargetInstrInfo is a superset of MRegister info. As /// such, whenever a client has an instance of instruction info, it should diff --git a/tools/llvmc/example/mcc16/plugins/PIC16Base/PluginMain.cpp b/tools/llvmc/example/mcc16/plugins/PIC16Base/PluginMain.cpp index 96dd296df6ef..40837cba8cbb 100644 --- a/tools/llvmc/example/mcc16/plugins/PIC16Base/PluginMain.cpp +++ b/tools/llvmc/example/mcc16/plugins/PIC16Base/PluginMain.cpp @@ -12,7 +12,7 @@ namespace llvmc { // Returns the platform specific directory separator via #ifdefs. // FIXME: This currently work on linux and windows only. It does not // work on other unices. -static std::string GetDirSeparator(void) { +static std::string GetDirSeparator() { #ifdef __linux__ return "/"; #else @@ -22,7 +22,7 @@ static std::string GetDirSeparator(void) { namespace hooks { // Get the dir where c16 executables reside. -std::string GetBinDir (void) { +std::string GetBinDir() { // Construct a Path object from the program name. void *P = (void*) (intptr_t) GetBinDir; sys::Path ProgramFullPath @@ -36,7 +36,7 @@ std::string GetBinDir (void) { } // Get the Top-level Installation dir for c16. -std::string GetInstallDir (void) { +std::string GetInstallDir() { sys::Path BinDirPath = sys::Path(GetBinDir()); // Go one more level up to get the install dir. @@ -46,22 +46,22 @@ std::string GetInstallDir (void) { } // Get the dir where the c16 header files reside. -std::string GetStdHeadersDir (void) { +std::string GetStdHeadersDir() { return GetInstallDir() + "include"; } // Get the dir where the assembler header files reside. -std::string GetStdAsmHeadersDir (void) { +std::string GetStdAsmHeadersDir() { return GetInstallDir() + "inc"; } // Get the dir where the linker scripts reside. -std::string GetStdLinkerScriptsDir (void) { +std::string GetStdLinkerScriptsDir() { return GetInstallDir() + "lkr"; } // Get the dir where startup code, intrinsics and lib reside. -std::string GetStdLibsDir (void) { +std::string GetStdLibsDir() { return GetInstallDir() + "lib"; } } diff --git a/utils/TableGen/Record.h b/utils/TableGen/Record.h index 11db910328a4..40c8239b9a32 100644 --- a/utils/TableGen/Record.h +++ b/utils/TableGen/Record.h @@ -782,7 +782,7 @@ class OpInit : public TypedInit { // Clone - Clone this operator, replacing arguments with the new list virtual OpInit *clone(std::vector &Operands) = 0; - virtual int getNumOperands(void) const = 0; + virtual int getNumOperands() const = 0; virtual Init *getOperand(int i) = 0; // Fold - If possible, fold this to a simpler init. Return this if not @@ -820,7 +820,7 @@ class UnOpInit : public OpInit { return new UnOpInit(getOpcode(), *Operands.begin(), getType()); } - int getNumOperands(void) const { return 1; } + int getNumOperands() const { return 1; } Init *getOperand(int i) { assert(i == 0 && "Invalid operand id for unary operator"); return getOperand(); @@ -864,7 +864,7 @@ class BinOpInit : public OpInit { return new BinOpInit(getOpcode(), Operands[0], Operands[1], getType()); } - int getNumOperands(void) const { return 2; } + int getNumOperands() const { return 2; } Init *getOperand(int i) { assert((i == 0 || i == 1) && "Invalid operand id for binary operator"); if (i == 0) { @@ -909,7 +909,7 @@ class TernOpInit : public OpInit { getType()); } - int getNumOperands(void) const { return 3; } + int getNumOperands() const { return 3; } Init *getOperand(int i) { assert((i == 0 || i == 1 || i == 2) && "Invalid operand id for ternary operator"); diff --git a/utils/TableGen/TGParser.cpp b/utils/TableGen/TGParser.cpp index ba480e6e926b..712226500540 100644 --- a/utils/TableGen/TGParser.cpp +++ b/utils/TableGen/TGParser.cpp @@ -974,7 +974,7 @@ Init *TGParser::ParseOperation(Record *CurRec) { /// /// OperatorType ::= '<' Type '>' /// -RecTy *TGParser::ParseOperatorType(void) { +RecTy *TGParser::ParseOperatorType() { RecTy *Type = 0; if (Lex.getCode() != tgtok::less) {