Changeset 17e5e2b for src/libcfa

Timestamp:

Jan 9, 2017, 5:34:26 PM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

d3a85240, ff2d7341

Parents:

f7ff3fb

Message:

Added proper include guards to cfa headers so they can be added to the c++ include path without issues

Location:

src/libcfa

Files:

• concurrency/threads (modified) (2 diffs)
• containers/vector (modified) (2 diffs)
• fstream (modified) (2 diffs)
• iostream (modified) (2 diffs)
• iterator (modified) (2 diffs)
• limits (modified) (2 diffs)
• math (modified) (2 diffs)
• rational (modified) (2 diffs)
• stdlib (modified) (2 diffs)

src/libcfa/concurrency/threads ¶

@@ -15 +15 @@
 //
 
-#ifndef __THREADS_H__
-#define __THREADS_H__
+#ifdef __CFORALL__
+
+#ifndef THREADS_H
+#define THREADS_H
 
 #include "assert"       //
@@ -111 +113 @@
 }
 
-#endif //__THREADS_H__
+#endif //THREADS_H
+
+#else
+#include_next <thread>
+#endif //__CFORALL__
 
 // Local Variables: //

src/libcfa/containers/vector ¶

@@ -14 +14 @@
 //
 
-#pragma once
+#ifdef __CFORALL__
+
+#ifndef VECTOR_H
+#define VECTOR_H
 
 extern "C" {
@@ -165 +168 @@
 }
 
+#endif // VECTOR_H
+
+#else
+#include_next <vector>
+#endif //__CFORALL__
+
 // Local Variables: //
 // mode: c //

src/libcfa/fstream ¶

@@ -13 +13 @@
 // Update Count     : 88
 //
+
+#ifdef __CFORALL__
 
 #ifndef __FSTREAM_H__
@@ -62 +64 @@
 #endif // __FSTREAM_H__
 
+#else
+#include_next <fstream>
+#endif //__CFORALL__
+
 // Local Variables: //
 // mode: c //

src/libcfa/iostream ¶

@@ -13 +13 @@
 // Update Count     : 93
 //
+
+#ifdef __CFORALL__
 
 #ifndef __IOSTREAM_H__
@@ -124 +126 @@
 forall( dtype istype | istream( istype ) ) istype * ?|?( istype *, _Istream_cstrC );
 
-#endif // __IOSTREAM_H__
+#endif // __IOSTREAM_H
+
+#else
+#include_next <iostream>
+#endif //__CFORALL__
 
 // Local Variables: //

src/libcfa/iterator ¶

@@ -13 +13 @@
 // Update Count     : 9
 //
+
+#ifdef __CFORALL__
 
 #ifndef ITERATOR_H
@@ -46 +48 @@
 #endif // ITERATOR_H
 
+#else
+#include_next <iterator>
+#endif //__CFORALL__
+
 // Local Variables: //
 // mode: c //

src/libcfa/limits ¶

@@ -13 +13 @@
 // Update Count     : 6
 // 
+
+#ifdef __CFORALL__
+
+#ifndef LIMITS_H
+#define LIMITS_H
 
 // Integral Constants
@@ -107 +112 @@
 extern const long _Complex _1_SQRT_2;                                   // 1 / sqrt(2)
 
+#endif // LIMITS_H
+
+#else
+#include_next <limits>
+#endif //__CFORALL__
+
 // Local Variables: //
 // mode: c //

src/libcfa/math ¶

@@ -14 +14 @@
 // 
 
+#ifdef __CFORALL__
+
+#ifndef MATH_H
+#define MATH_H
+
 extern "C" {
 #include <math.h>                                                                               // fpclassify, isfinite, isnormal, isnan, isinf
@@ -349 +354 @@
 long double scalbln( long double, long int );
 
+#endif // MATH_H
+
+#else
+#include_next <math>
+#endif //__CFORALL__
+
 // Local Variables: //
 // mode: c //

src/libcfa/rational ¶

@@ -15 +15 @@
 // Update Count     : 16
 // 
+#ifdef __CFORALL__
+
+#ifndef RATIONAL_H
+#define RATIONAL_H
 
 #include "iostream"
@@ -61 +65 @@
 forall( dtype ostype | ostream( ostype ) ) ostype * ?|?( ostype *, Rational );
 
+#endif // RATIONAL_H
+
+#else
+#include_next <rational>
+#endif //__CFORALL__
+
 // Local Variables: //
 // mode: c //

src/libcfa/stdlib ¶

@@ -13 +13 @@
 // Update Count     : 99
 //
+
+#ifdef __CFORALL__
+
+#ifndef STDLIB_H
+#define STDLIB_H
 
 //---------------------------------------
@@ -127 +132 @@
 void swap( T * t1, T * t2 );
 
+#endif // STDLIB_H
+
+#else
+#include_next <stdlib>
+#endif //__CFORALL__
+
 // Local Variables: //
 // mode: c //