christoph/lecture-operating-system-development
1
Fork 0
Code Activity

disable concepts since we don't have c++20

Browse Source
This commit is contained in:
churl
2022-05-20 16:15:56 +02:00
parent 5e2196c898
commit 2b41893743
3 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
c_os/lib/OutStream.h
View File

@ -23,7 +23,7 @@
#define __OutStream_include__
#include "lib/StringBuffer.h"
#include <concepts>
// #include <concepts> // NOTE: Only available in c++20
// NOTE: I added this
class fillw {
@ -77,9 +77,13 @@ public:
// This allows chaining of operator<< of different streams.
// Needed because I added operator<< overloads to the CGA_Stream class to change color with manipulators.
// NOTE: The templace concepts are only available in c++20.
// Leaving them out makes this unsafe, but it doesn't matter as much in this case since we only
// use a CGA_Stream in Globals.h anyway.
// Darstellung eines Zeichens (trivial)
template<typename T>
requires std::derived_from<T, OutStream>
// requires std::derived_from<T, OutStream>
friend T& operator<<(T& os, char c) {
os.put(c);
if (c != '\n') {
@ -90,14 +94,14 @@ public:
}
template<typename T>
requires std::derived_from<T, OutStream>
// requires std::derived_from<T, OutStream>
friend T& operator<<(T& os, unsigned char c) {
return os << (char)c;
}
// Darstellung einer nullterminierten Zeichenkette
template<typename T>
requires std::derived_from<T, OutStream>
// requires std::derived_from<T, OutStream>
friend T& operator<<(T& os, char* string) {
char* pos = string;
@ -111,31 +115,31 @@ public:
// Darstellung ganzer Zahlen im Zahlensystem zur Basis base
template<typename T>
requires std::derived_from<T, OutStream>
// requires std::derived_from<T, OutStream>
friend T& operator<<(T& os, short ival) {
return os << (long)ival;
}
template<typename T>
requires std::derived_from<T, OutStream>
// requires std::derived_from<T, OutStream>
friend T& operator<<(T& os, unsigned short ival) {
return os << (unsigned long)ival;
}
template<typename T>
requires std::derived_from<T, OutStream>
// requires std::derived_from<T, OutStream>
friend T& operator<<(T& os, int ival) {
return os << (long)ival;
}
template<typename T>
requires std::derived_from<T, OutStream>
// requires std::derived_from<T, OutStream>
friend T& operator<<(T& os, unsigned int ival) {
return os << (unsigned long)ival;
}
template<typename T>
requires std::derived_from<T, OutStream>
// requires std::derived_from<T, OutStream>
friend T& operator<<(T& os, long ival) {
// Bei negativen Werten wird ein Minuszeichen ausgegeben.
if (ival < 0) {
@ -147,7 +151,7 @@ public:
}
template<typename T>
requires std::derived_from<T, OutStream>
// requires std::derived_from<T, OutStream>
friend T& operator<<(T& os, unsigned long ival) {
unsigned long div;
char digit;
@ -179,7 +183,7 @@ public:
// Darstellung eines Zeigers als hexadezimale ganze Zahl
template<typename T>
requires std::derived_from<T, OutStream>
// requires std::derived_from<T, OutStream>
friend T& operator<<(T& os, void* ptr) {
int oldbase = os.base;
os.base = 16;
@ -191,14 +195,14 @@ public:
// Aufruf einer Manipulatorfunktion
// NOTE: Changed the function pointer type including the manipulator functions
template<typename T>
requires std::derived_from<T, OutStream>
// requires std::derived_from<T, OutStream>
friend T& operator<<(T& os, T& (*f)(T&)) {
return f(os);
}
// NOTE: I added this
template<typename T>
requires std::derived_from<T, OutStream>
// requires std::derived_from<T, OutStream>
friend T& operator<<(T& os, const fillw& w) {
os.flush(); // Flush the buffer to not modify previous output
os.fill_width = w.w;
@ -206,7 +210,7 @@ public:
}
template<typename T>
requires std::derived_from<T, OutStream>
// requires std::derived_from<T, OutStream>
friend T& operator<<(T& os, const fillc& c) {
os.flush();
os.fill_char = c.c;