Changeset de53138 in mainline for uspace/lib/cpp/include/cstdio

Timestamp:

2018-07-05T21:41:21Z (6 years ago)

Author:

Dzejrou <dzejrou@…>

Branches:

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

Children:

c71c171

Parents:

6d8a63a

git-author:

Dzejrou <dzejrou@…> (2018-04-20 00:11:54)

git-committer:

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

Message:

cpp: revamped c header wrappers, now only include standard symbols, others are in std::hel, fixed some bugs

File:

• uspace/lib/cpp/include/cstdio (modified) (2 diffs)

uspace/lib/cpp/include/cstdio

@@ -1 +1 @@
 /*
- * Copyright (c) 2017 Jaroslav Jindrak
+ * Copyright (c) 2018 Jaroslav Jindrak
  * All rights reserved.
  *
@@ -32 +32 @@
 #include "internal/common.hpp"
 
+namespace std::hel
+{
+    extern "C" {
+        #include <stdio.h>
+    }
+}
+
 namespace std
 {
+    using std::hel::FILE;
+    /* using std::hel::fpos_t */
+    using std::hel::size_t;
 
-extern "C" {
-#include <stdio.h>
+    using std::hel::clearerr;
+    using std::hel::fclose;
+    using std::hel::feof;
+    using std::hel::ferror;
+    using std::hel::fflush;
+    using std::hel::fgetc;
+    /* using std::hel::fgetpos; */
+    using std::hel::fgets;
+    using std::hel::fopen;
+    using std::hel::fprintf;
+    using std::hel::fputc;
+    using std::hel::fputs;
+    using std::hel::fread;
+    using std::hel::freopen;
+    /* using std::hel::fscanf; */
+    using std::hel::fseek;
+    /* using std::hel::fsetpos; */
+    using std::hel::ftell;
+    using std::hel::fwrite;
+    /* using std::hel::getc; */
+    using std::hel::getchar;
+    /* using std::hel::perror; */
+    using std::hel::printf;
+    /* using std::hel::putc; */
+    using std::hel::putchar;
+    using std::hel::puts;
+    using std::hel::remove;
+    using std::hel::rename;
+    using std::hel::rewind;
+    /* using std::hel::scanf; */
+    using std::hel::setbuf;
+    using std::hel::setvbuf;
+    using std::hel::snprintf;
+    /* using std::hel::sprintf; */
+    /* using std::hel::sscanf; */
+    /* using std::hel::tmpfile; */
+    /* using std::hel::tmpnam; */
+    using std::hel::ungetc;
+    using std::hel::vfprintf;
+    using std::hel::vprintf;
+    /* using std::hel::vscanf; */
+    using std::hel::vsnprintf;
+    /* using std::hel::vsprintf; */
+    /* using std::hel::vsscanf; */
 }
 
-}
+using std::hel::FILE;
+/* using std::hel::fpos_t */
+using std::hel::size_t;
+
+using std::hel::clearerr;
+using std::hel::fclose;
+using std::hel::feof;
+using std::hel::ferror;
+using std::hel::fflush;
+using std::hel::fgetc;
+/* using std::hel::fgetpos; */
+using std::hel::fgets;
+using std::hel::fopen;
+using std::hel::fprintf;
+using std::hel::fputc;
+using std::hel::fputs;
+using std::hel::fread;
+using std::hel::freopen;
+/* using std::hel::fscanf; */
+using std::hel::fseek;
+/* using std::hel::fsetpos; */
+using std::hel::ftell;
+using std::hel::fwrite;
+/* using std::hel::getc; */
+using std::hel::getchar;
+/* using std::hel::perror; */
+using std::hel::printf;
+/* using std::hel::putc; */
+using std::hel::putchar;
+using std::hel::puts;
+using std::hel::remove;
+using std::hel::rename;
+using std::hel::rewind;
+/* using std::hel::scanf; */
+using std::hel::setbuf;
+using std::hel::setvbuf;
+using std::hel::snprintf;
+/* using std::hel::sprintf; */
+/* using std::hel::sscanf; */
+/* using std::hel::tmpfile; */
+/* using std::hel::tmpnam; */
+using std::hel::ungetc;
+using std::hel::vfprintf;
+using std::hel::vprintf;
+/* using std::hel::vscanf; */
+using std::hel::vsnprintf;
+/* using std::hel::vsprintf; */
+/* using std::hel::vsscanf; */
 
 #endif