[llvm] r269848 - [Object] Move isNotObjectErrorInvalidFileType out of header.

[Lang Hames via llvm-commits]

Author: lhames
Date: Tue May 17 16:38:53 2016
New Revision: 269848

URL: http://llvm.org/viewvc/llvm-project?rev=269848&view=rev
Log:
[Object] Move isNotObjectErrorInvalidFileType out of header.

Modified:
    llvm/trunk/include/llvm/Object/Error.h
    llvm/trunk/lib/Object/Error.cpp

Modified: llvm/trunk/include/llvm/Object/Error.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Object/Error.h?rev=269848&r1=269847&r2=269848&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Object/Error.h (original)
+++ llvm/trunk/include/llvm/Object/Error.h Tue May 17 16:38:53 2016
@@ -72,6 +72,13 @@ private:
   std::string Msg;
 };
 
+/// isNotObjectErrorInvalidFileType() is used when looping through the children
+/// of an archive after calling getAsBinary() on the child and it returns an
+/// llvm::Error.  In the cases we want to loop through the children and ignore the
+/// non-objects in the archive this is used to test the error to see if an
+/// error() function needs to called on the llvm::Error.
+Error isNotObjectErrorInvalidFileType(llvm::Error Err);
+
 } // end namespace object.
 
 } // end namespace llvm.
@@ -81,34 +88,4 @@ template <>
 struct is_error_code_enum<llvm::object::object_error> : std::true_type {};
 }
 
-namespace llvm {
-namespace object {
-
-// isNotObjectErrorInvalidFileType() is used when looping through the children
-// of an archive after calling getAsBinary() on the child and it returns an
-// llvm::Error.  In the cases we want to loop through the children and ignore the
-// non-objects in the archive this is used to test the error to see if an
-// error() function needs to called on the llvm::Error.
-static inline llvm::Error isNotObjectErrorInvalidFileType(llvm::Error Err) {
-  if (auto Err2 =
-       handleErrors(std::move(Err),
-         [](std::unique_ptr<ECError> M) {
-           // Try to handle 'M'. If successful, return a success value from
-           // the handler.
-           if (M->convertToErrorCode() == object_error::invalid_file_type)
-             return Error::success();
-
-           // We failed to handle 'M' - return it from the handler.
-           // This value will be passed back from catchErrors and
-           // wind up in Err2, where it will be returned from this function.
-           return Error(std::move(M));
-         }))
-    return Err2;
-  return Err;
-}
-
-} // end namespace object.
-
-} // end namespace llvm.
-
 #endif

Modified: llvm/trunk/lib/Object/Error.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Object/Error.cpp?rev=269848&r1=269847&r2=269848&view=diff
==============================================================================
--- llvm/trunk/lib/Object/Error.cpp (original)
+++ llvm/trunk/lib/Object/Error.cpp Tue May 17 16:38:53 2016
@@ -71,3 +71,21 @@ static ManagedStatic<_object_error_categ
 const std::error_category &object::object_category() {
   return *error_category;
 }
+
+llvm::Error llvm::object::isNotObjectErrorInvalidFileType(llvm::Error Err) {
+  if (auto Err2 =
+       handleErrors(std::move(Err),
+         [](std::unique_ptr<ECError> M) {
+           // Try to handle 'M'. If successful, return a success value from
+           // the handler.
+           if (M->convertToErrorCode() == object_error::invalid_file_type)
+             return Error::success();
+
+           // We failed to handle 'M' - return it from the handler.
+           // This value will be passed back from catchErrors and
+           // wind up in Err2, where it will be returned from this function.
+           return Error(std::move(M));
+         }))
+    return Err2;
+  return Err;
+}