[llvm-commits] CVS: llvm/include/llvm/Support/CommandLine.h

[Chris Lattner]

Changes in directory llvm/include/llvm/Support:

CommandLine.h updated: 1.51 -> 1.52
---
Log message:

Move the END_WITH_NULL marker.  Vladimir suggests that this works better with
GCC 4.1.  I tried it with 4.0 and 3.3 and it seems fine.


---
Diffs of the changes:  (+2 -7)

 CommandLine.h |    9 ++-------
 1 files changed, 2 insertions(+), 7 deletions(-)


Index: llvm/include/llvm/Support/CommandLine.h
diff -u llvm/include/llvm/Support/CommandLine.h:1.51 llvm/include/llvm/Support/CommandLine.h:1.52
--- llvm/include/llvm/Support/CommandLine.h:1.51	Sun Oct 23 10:22:50 2005
+++ llvm/include/llvm/Support/CommandLine.h	Mon Oct 24 00:03:46 2005
@@ -334,14 +334,9 @@
   }
 };
 
-// Silly GCC doesn't allow attributes on a function definition.
 template<class DataType>
-ValuesClass<DataType> values(const char *Arg, DataType Val, const char *Desc,
-                             ...) END_WITH_NULL;
-
-template<class DataType>
-ValuesClass<DataType> values(const char *Arg, DataType Val, const char *Desc,
-                             ...) {
+ValuesClass<DataType> END_WITH_NULL values(const char *Arg, DataType Val, 
+                                           const char *Desc, ...) {
     va_list ValueArgs;
     va_start(ValueArgs, Desc);
     ValuesClass<DataType> Vals(Arg, Val, Desc, ValueArgs);