X-Git-Url: http://plrg.eecs.uci.edu/git/?p=oota-llvm.git;a=blobdiff_plain;f=include%2Fllvm%2FSupport%2FOptions.h;h=4fd1bff358fd7034886d9804b0bdd94ae9312685;hp=047d840676ff54688e22d56095f549068e2ba0d4;hb=fa4129347ff209f580a5fb57c53d60a13ac685e6;hpb=c14fb896803930ccf22d3ae6af0a013575b3b5c0

diff --git a/include/llvm/Support/Options.h b/include/llvm/Support/Options.h
index 047d840676f..4fd1bff358f 100644
--- a/include/llvm/Support/Options.h
+++ b/include/llvm/Support/Options.h
@@ -28,12 +28,15 @@
 /// example of reading the above option would be:
 ///
 /// ScalarizeLoadStore =
-///   M.getContext().template getOption<bool,
-///                                     Scalarizer,
-///                                     &Scalarizer::ScalarizeLoadStore>();
+///   M.getContext().getOption<bool,
+///                            Scalarizer,
+///                            &Scalarizer::ScalarizeLoadStore>();
 ///
 //===----------------------------------------------------------------------===//
 
+#ifndef LLVM_SUPPORT_OPTIONS_H
+#define LLVM_SUPPORT_OPTIONS_H
+
 #include "llvm/ADT/DenseMap.h"
 #include "llvm/Support/CommandLine.h"
 
@@ -81,9 +84,9 @@ public:
 
   /// \brief Registers an option with the OptionRegistry singleton.
   ///
-  /// \param ValT type of the option's data
-  /// \param Base class used to key the option
-  /// \param Mem member of \p Base used for keying the option
+  /// \tparam ValT type of the option's data
+  /// \tparam Base class used to key the option
+  /// \tparam Mem member of \p Base used for keying the option
   ///
   /// Options are keyed off the template parameters to generate unique static
   /// characters. The template parameters are (1) the type of the data the
@@ -99,9 +102,9 @@ public:
 
   /// \brief Returns the value of the option.
   ///
-  /// \param ValT type of the option's data
-  /// \param Base class used to key the option
-  /// \param Mem member of \p Base used for keying the option
+  /// \tparam ValT type of the option's data
+  /// \tparam Base class used to key the option
+  /// \tparam Mem member of \p Base used for keying the option
   ///
   /// Reads option values based on the key generated by the template parameters.
   /// Keying for get() is the same as keying for registerOption.
@@ -113,3 +116,5 @@ public:
 };
 
 } // namespace llvm
+
+#endif