Changeset b57a3ee in mainline for uspace/lib/cpp/include/__bits/io

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:

c735afb

Parents:

4f461384

git-author:

Dzejrou <dzejrou@…> (2018-06-25 16:58:08)

git-committer:

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

Message:

cpp: refactored the library layout, everything from the impl directory was moved to the bits directory for the sake of consistency, updated copyright notices and include guards

Location:

uspace/lib/cpp/include/__bits/io

Files:

• fstream.hpp (moved) (moved from uspace/lib/cpp/include/impl/fstream.hpp ) (2 diffs)
• iomanip.hpp (moved) (moved from uspace/lib/cpp/include/impl/iomanip.hpp ) (1 diff)
• iomanip_objs.hpp (moved) (moved from uspace/lib/cpp/include/__bits/iomanip.hpp ) (2 diffs)
• ios.hpp (moved) (moved from uspace/lib/cpp/include/impl/ios.hpp ) (2 diffs)
• iosfwd.hpp (moved) (moved from uspace/lib/cpp/include/impl/iosfwd.hpp ) (2 diffs)
• iostream.hpp (moved) (moved from uspace/lib/cpp/include/impl/iostream.hpp ) (2 diffs)
• istream.hpp (moved) (moved from uspace/lib/cpp/include/impl/istream.hpp ) (2 diffs)
• ostream.hpp (moved) (moved from uspace/lib/cpp/include/impl/ostream.hpp ) (2 diffs)
• sstream.hpp (moved) (moved from uspace/lib/cpp/include/impl/sstream.hpp ) (2 diffs)
• streambuf.hpp (moved) (moved from uspace/lib/cpp/include/impl/streambuf.hpp ) (2 diffs)
• streambufs.hpp (moved) (moved from uspace/lib/cpp/include/__bits/streambufs.hpp ) (2 diffs)

uspace/lib/cpp/include/__bits/io/fstream.hpp

@@ -1 +1 @@
 /*
- * Copyright (c) 2017 Jaroslav Jindrak
+ * Copyright (c) 2018 Jaroslav Jindrak
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-#ifndef LIBCPP_FSTREAM
-#define LIBCPP_FSTREAM
+#ifndef LIBCPP_BITS_IO_FSTREAM
+#define LIBCPP_BITS_IO_FSTREAM
 
 #include <cstdio>

uspace/lib/cpp/include/__bits/io/iomanip.hpp

@@ -27 +27 @@
  */
 
-#ifndef LIBCPP_IOMANIP
-#define LIBCPP_IOMANIP
+#ifndef LIBCPP_BITS_IO_IOMANIP
+#define LIBCPP_BITS_IO_IOMANIP
 
-#include <__bits/iomanip.hpp>
+#include <__bits/io/iomanip_objs.hpp>
 #include <iosfwd>
 

uspace/lib/cpp/include/__bits/io/iomanip_objs.hpp

@@ -27 +27 @@
  */
 
-#ifndef LIBCPP_BITS_IOMANIP
-#define LIBCPP_BITS_IOMANIP
+#ifndef LIBCPP_BITS_IO_IOMANIP_OBJS
+#define LIBCPP_BITS_IO_IOMANIP_OBJS
 
 #include <ios>
@@ -56 +56 @@
         Manipulator manipulator;
     };
+
     template<class Char, class Traits, class Manipulator>
     basic_ostream<Char, Traits>& operator<<(

uspace/lib/cpp/include/__bits/io/ios.hpp

@@ -1 +1 @@
 /*
- * Copyright (c) 2017 Jaroslav Jindrak
+ * Copyright (c) 2018 Jaroslav Jindrak
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-#ifndef LIBCPP_IOS
-#define LIBCPP_IOS
-
+#ifndef LIBCPP_BITS_IO_IOS
+#define LIBCPP_BITS_IO_IOS
+
+#include <__bits/locale/locale.hpp>
+#include <__bits/locale/ctype.hpp>
 #include <cstdlib>
-#include <__bits/locale.hpp>
-#include <__bits/locale/ctype.hpp>
 #include <iosfwd>
 #include <system_error>

uspace/lib/cpp/include/__bits/io/iosfwd.hpp

@@ -1 +1 @@
 /*
- * Copyright (c) 2017 Jaroslav Jindrak
+ * Copyright (c) 2018 Jaroslav Jindrak
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-#ifndef LIBCPP_IOSFWD
-#define LIBCPP_IOSFWD
+#ifndef LIBCPP_BITS_IO_IOSFWD
+#define LIBCPP_BITS_IO_IOSFWD
 
 namespace std

uspace/lib/cpp/include/__bits/io/iostream.hpp

@@ -1 +1 @@
 /*
- * Copyright (c) 2017 Jaroslav Jindrak
+ * Copyright (c) 2018 Jaroslav Jindrak
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-#ifndef LIBCPP_IOSTREAM
-#define LIBCPP_IOSTREAM
+#ifndef LIBCPP_BITS_IO_IOSTREAM
+#define LIBCPP_BITS_IO_IOSTREAM
 
 #include <ios>

uspace/lib/cpp/include/__bits/io/istream.hpp

@@ -1 +1 @@
 /*
- * Copyright (c) 2017 Jaroslav Jindrak
+ * Copyright (c) 2018 Jaroslav Jindrak
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-#ifndef LIBCPP_ISTREAM
-#define LIBCPP_ISTREAM
+#ifndef LIBCPP_BITS_IO_ISTREAM
+#define LIBCPP_BITS_IO_ISTREAM
 
 #include <ios>

uspace/lib/cpp/include/__bits/io/ostream.hpp

@@ -1 +1 @@
 /*
- * Copyright (c) 2017 Jaroslav Jindrak
+ * Copyright (c) 2018 Jaroslav Jindrak
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-#ifndef LIBCPP_OSTREAM
-#define LIBCPP_OSTREAM
+#ifndef LIBCPP_BITS_IO_OSTREAM
+#define LIBCPP_BITS_IO_OSTREAM
 
 #include <ios>

uspace/lib/cpp/include/__bits/io/sstream.hpp

@@ -1 +1 @@
 /*
- * Copyright (c) 2017 Jaroslav Jindrak
+ * Copyright (c) 2018 Jaroslav Jindrak
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-#ifndef LIBCPP_SSTREAM
-#define LIBCPP_SSTREAM
+#ifndef LIBCPP_BITS_IO_SSTREAM
+#define LIBCPP_BITS_IO_SSTREAM
 
 #include <ios>

uspace/lib/cpp/include/__bits/io/streambuf.hpp

@@ -1 +1 @@
 /*
- * Copyright (c) 2017 Jaroslav Jindrak
+ * Copyright (c) 2018 Jaroslav Jindrak
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-#ifndef LIBCPP_STREAMBUF
-#define LIBCPP_STREAMBUF
+#ifndef LIBCPP_BITS_IO_STREAMBUF
+#define LIBCPP_BITS_IO_STREAMBUF
 
 #include <ios>

uspace/lib/cpp/include/__bits/io/streambufs.hpp

@@ -1 +1 @@
 /*
- * Copyright (c) 2017 Jaroslav Jindrak
+ * Copyright (c) 2018 Jaroslav Jindrak
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-#ifndef LIBCPP_STREAMBUFS
-#define LIBCPP_STREAMBUFS
+#ifndef LIBCPP_BITS_IO_STREAMBUFS
+#define LIBCPP_BITS_IO_STREAMBUFS
 
 #include <iosfwd>