aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/clang/Sema/Initialization.h16
-rw-r--r--lib/Sema/SemaInit.cpp6
2 files changed, 10 insertions, 12 deletions
diff --git a/include/clang/Sema/Initialization.h b/include/clang/Sema/Initialization.h
index d92bdae307..268806b3b8 100644
--- a/include/clang/Sema/Initialization.h
+++ b/include/clang/Sema/Initialization.h
@@ -638,7 +638,7 @@ public:
};
private:
- /// \brief The reason why initialization failued.
+ /// \brief The reason why initialization failed.
FailureKind Failure;
/// \brief The failed result of overload resolution.
@@ -738,13 +738,13 @@ public:
/// constructor.
bool isConstructorInitialization() const;
- // \brief Returns whether the last step in this initialization sequence is a
- // narrowing conversion, defined by C++0x [dcl.init.list]p7.
- //
- // If this function returns true, *isInitializerConstant will be set to
- // describe whether *Initializer was a constant expression. If
- // *isInitializerConstant is set to true, *ConstantValue will be set to the
- // evaluated value of *Initializer.
+ /// \brief Returns whether the last step in this initialization sequence is a
+ /// narrowing conversion, defined by C++0x [dcl.init.list]p7.
+ ///
+ /// If this function returns true, *isInitializerConstant will be set to
+ /// describe whether *Initializer was a constant expression. If
+ /// *isInitializerConstant is set to true, *ConstantValue will be set to the
+ /// evaluated value of *Initializer.
bool endsWithNarrowing(ASTContext &Ctx, const Expr *Initializer,
bool *isInitializerConstant,
APValue *ConstantValue) const;
diff --git a/lib/Sema/SemaInit.cpp b/lib/Sema/SemaInit.cpp
index f710380720..83ea813c88 100644
--- a/lib/Sema/SemaInit.cpp
+++ b/lib/Sema/SemaInit.cpp
@@ -7,9 +7,7 @@
//
//===----------------------------------------------------------------------===//
//
-// This file implements semantic analysis for initializers. The main entry
-// point is Sema::CheckInitList(), but all of the work is performed
-// within the InitListChecker class.
+// This file implements semantic analysis for initializers.
//
//===----------------------------------------------------------------------===//
@@ -733,7 +731,7 @@ void InitListChecker::CheckSubElementType(const InitializedEntity &Entity,
} else if (SemaRef.getLangOptions().CPlusPlus) {
// C++ [dcl.init.aggr]p12:
// All implicit type conversions (clause 4) are considered when
- // initializing the aggregate member with an ini- tializer from
+ // initializing the aggregate member with an initializer from
// an initializer-list. If the initializer can initialize a
// member, the member is initialized. [...]