Changeset 7bbf91e in mainline for uspace/lib/cpp/include/__bits/trycatch.hpp

Timestamp:

2018-07-05T21:41:24Z (7 years ago)

Author:

Dzejrou <dzejrou@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

2e53e83d

Parents:

fc15120

git-author:

Dzejrou <dzejrou@…> (2018-05-16 18:35:17)

git-committer:

Dzejrou <dzejrou@…> (2018-07-05 21:41:24)

Message:

cpp: changed internal to bits to avoid include space pollusion, fixed old std::hel:: bugs in files that weren't touched since

File:

• uspace/lib/cpp/include/__bits/trycatch.hpp (moved) (moved from uspace/lib/cpp/include/internal/trycatch.hpp ) (2 diffs)

uspace/lib/cpp/include/__bits/trycatch.hpp

@@ -27 +27 @@
  */
 
-#ifndef LIBCPP_INTERNAL_TRYCATCH
-#define LIBCPP_INTERNAL_TRYCATCH
+#ifndef LIBCPP_BITS_TRYCATCH
+#define LIBCPP_BITS_TRYCATCH
 
 // TODO: This header should be included in every libcpp header.
@@ -45 +45 @@
 #if LIBCPP_EXCEPTIONS_SUPPORTED == 0
 
+/**
+ * In case the file where our macros get expanded
+ * does not include cstdlib.
+ */
+extern "C" void abort(void) __attribute__((noreturn));
+extern "C" int printf(const char*, ...);
+
 namespace std
 {
-    /**
-     * In case the file where our macros get expanded
-     * does not include cstdlib.
-     */
-    extern "C" void abort(void) __attribute__((noreturn));
-    extern "C" int printf(const char*, ...);
-
     namespace aux
     {