diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-08-18 12:04:45 +0200 |
|---|---|---|
| committer | Henning Baldersheim <balder@yahoo-inc.com> | 2017-08-18 12:04:45 +0200 |
| commit | 64809ac8367bb4c059f55a8595f47a323237b238 (patch) | |
| tree | 62af23907c274c398b231340c006a76700c8f90c /fsa | |
| parent | 7bbbf406f3cd920222aba9039c6a460370a4ab14 (diff) | |
Remove more clutter in fastos/types.h
Diffstat (limited to 'fsa')
| -rw-r--r-- | fsa/src/libfsa/automaton-alternate.h | 2 | ||||
| -rw-r--r-- | fsa/src/vespa/fsa/automaton.h | 2 | ||||
| -rw-r--r-- | fsa/src/vespa/fsa/conceptnet.h | 2 | ||||
| -rw-r--r-- | fsa/src/vespa/fsa/unicode.cpp | 2 | ||||
| -rw-r--r-- | fsa/src/vespa/fsamanagers/mutex.cpp | 2 | ||||
| -rw-r--r-- | fsa/src/vespa/fsamanagers/rwlock.cpp | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/fsa/src/libfsa/automaton-alternate.h b/fsa/src/libfsa/automaton-alternate.h index 535b0f16014..1d64a08ee52 100644 --- a/fsa/src/libfsa/automaton-alternate.h +++ b/fsa/src/libfsa/automaton-alternate.h @@ -13,7 +13,7 @@ #include <list> #include <string> #include <vector> -#include <assert.h> +#include <cassert> #include <sys/mman.h> // for mmap() etc #include "blob.h" diff --git a/fsa/src/vespa/fsa/automaton.h b/fsa/src/vespa/fsa/automaton.h index 18d56cd4291..f1bcca87cf6 100644 --- a/fsa/src/vespa/fsa/automaton.h +++ b/fsa/src/vespa/fsa/automaton.h @@ -13,7 +13,7 @@ #include <map> #include <list> #include <string> -#include <assert.h> +#include <cassert> #include "blob.h" #include "fsa.h" diff --git a/fsa/src/vespa/fsa/conceptnet.h b/fsa/src/vespa/fsa/conceptnet.h index f082660ff18..d17b64bead5 100644 --- a/fsa/src/vespa/fsa/conceptnet.h +++ b/fsa/src/vespa/fsa/conceptnet.h @@ -10,7 +10,7 @@ #pragma once -#include <assert.h> +#include <cassert> #include <stdlib.h> #include "file.h" // for FileAccessMethod #include "fsa.h" diff --git a/fsa/src/vespa/fsa/unicode.cpp b/fsa/src/vespa/fsa/unicode.cpp index d4e92d6ca23..870d16ced2c 100644 --- a/fsa/src/vespa/fsa/unicode.cpp +++ b/fsa/src/vespa/fsa/unicode.cpp @@ -5,7 +5,7 @@ #include "unicode.h" -#include <assert.h> +#include <cassert> #include <cstdlib> namespace fsa { diff --git a/fsa/src/vespa/fsamanagers/mutex.cpp b/fsa/src/vespa/fsamanagers/mutex.cpp index 01915b3c185..ba3e5b70c6f 100644 --- a/fsa/src/vespa/fsamanagers/mutex.cpp +++ b/fsa/src/vespa/fsamanagers/mutex.cpp @@ -15,7 +15,7 @@ #ifndef DISABLE_THREADS #include <pthread.h> #include <sched.h> -#include <assert.h> +#include <cassert> #endif #include "mutex.h" diff --git a/fsa/src/vespa/fsamanagers/rwlock.cpp b/fsa/src/vespa/fsamanagers/rwlock.cpp index 3e15d5fd9cf..ee322494968 100644 --- a/fsa/src/vespa/fsamanagers/rwlock.cpp +++ b/fsa/src/vespa/fsamanagers/rwlock.cpp @@ -15,7 +15,7 @@ #ifndef DISABLE_THREADS #include <pthread.h> #include <sched.h> -#include <assert.h> +#include <cassert> #endif #include "rwlock.h" |