From 2ab48defab1f0c8918cd7612c1943be7503e4d30 Mon Sep 17 00:00:00 2001 From: Mathias Preiner Date: Wed, 24 Apr 2019 15:39:24 -0700 Subject: Do not use __ prefix for header guards. (#2974) Fixes 2887. --- src/theory/strings/normal_form.h | 6 +++--- src/theory/strings/regexp_elim.h | 6 +++--- src/theory/strings/regexp_operation.h | 6 +++--- src/theory/strings/regexp_solver.h | 6 +++--- src/theory/strings/skolem_cache.h | 6 +++--- src/theory/strings/theory_strings.h | 6 +++--- src/theory/strings/theory_strings_preprocess.h | 6 +++--- src/theory/strings/theory_strings_rewriter.h | 6 +++--- src/theory/strings/theory_strings_type_rules.h | 6 +++--- src/theory/strings/type_enumerator.h | 6 +++--- 10 files changed, 30 insertions(+), 30 deletions(-) (limited to 'src/theory/strings') diff --git a/src/theory/strings/normal_form.h b/src/theory/strings/normal_form.h index 73036e68f..3d1326570 100644 --- a/src/theory/strings/normal_form.h +++ b/src/theory/strings/normal_form.h @@ -14,8 +14,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__STRINGS__NORMAL_FORM_H -#define __CVC4__THEORY__STRINGS__NORMAL_FORM_H +#ifndef CVC4__THEORY__STRINGS__NORMAL_FORM_H +#define CVC4__THEORY__STRINGS__NORMAL_FORM_H #include #include @@ -156,4 +156,4 @@ class NormalForm } // namespace theory } // namespace CVC4 -#endif /* __CVC4__THEORY__STRINGS__NORMAL_FORM_H */ +#endif /* CVC4__THEORY__STRINGS__NORMAL_FORM_H */ diff --git a/src/theory/strings/regexp_elim.h b/src/theory/strings/regexp_elim.h index 6d2f28eaa..dbd4102b6 100644 --- a/src/theory/strings/regexp_elim.h +++ b/src/theory/strings/regexp_elim.h @@ -14,8 +14,8 @@ **/ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__STRINGS__REGEXP_ELIM_H -#define __CVC4__THEORY__STRINGS__REGEXP_ELIM_H +#ifndef CVC4__THEORY__STRINGS__REGEXP_ELIM_H +#define CVC4__THEORY__STRINGS__REGEXP_ELIM_H #include "expr/node.h" @@ -63,4 +63,4 @@ class RegExpElimination } // namespace theory } // namespace CVC4 -#endif /* __CVC4__THEORY__STRINGS__REGEXP_ELIM_H */ +#endif /* CVC4__THEORY__STRINGS__REGEXP_ELIM_H */ diff --git a/src/theory/strings/regexp_operation.h b/src/theory/strings/regexp_operation.h index 4a7b7b293..b2e3667fc 100644 --- a/src/theory/strings/regexp_operation.h +++ b/src/theory/strings/regexp_operation.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__STRINGS__REGEXP__OPERATION_H -#define __CVC4__THEORY__STRINGS__REGEXP__OPERATION_H +#ifndef CVC4__THEORY__STRINGS__REGEXP__OPERATION_H +#define CVC4__THEORY__STRINGS__REGEXP__OPERATION_H #include #include @@ -100,4 +100,4 @@ class RegExpOpr { }/* CVC4::theory namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__THEORY__STRINGS__REGEXP__OPERATION_H */ +#endif /* CVC4__THEORY__STRINGS__REGEXP__OPERATION_H */ diff --git a/src/theory/strings/regexp_solver.h b/src/theory/strings/regexp_solver.h index 8b78e6ebc..13b66557a 100644 --- a/src/theory/strings/regexp_solver.h +++ b/src/theory/strings/regexp_solver.h @@ -15,8 +15,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__STRINGS__REGEXP_SOLVER_H -#define __CVC4__THEORY__STRINGS__REGEXP_SOLVER_H +#ifndef CVC4__THEORY__STRINGS__REGEXP_SOLVER_H +#define CVC4__THEORY__STRINGS__REGEXP_SOLVER_H #include #include "context/cdhashset.h" @@ -103,4 +103,4 @@ class RegExpSolver } // namespace theory } // namespace CVC4 -#endif /* __CVC4__THEORY__STRINGS__THEORY_STRINGS_H */ +#endif /* CVC4__THEORY__STRINGS__THEORY_STRINGS_H */ diff --git a/src/theory/strings/skolem_cache.h b/src/theory/strings/skolem_cache.h index fd40e2521..c1e3c7214 100644 --- a/src/theory/strings/skolem_cache.h +++ b/src/theory/strings/skolem_cache.h @@ -14,8 +14,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__STRINGS__SKOLEM_CACHE_H -#define __CVC4__THEORY__STRINGS__SKOLEM_CACHE_H +#ifndef CVC4__THEORY__STRINGS__SKOLEM_CACHE_H +#define CVC4__THEORY__STRINGS__SKOLEM_CACHE_H #include #include @@ -168,4 +168,4 @@ class SkolemCache } // namespace theory } // namespace CVC4 -#endif /* __CVC4__THEORY__STRINGS__SKOLEM_CACHE_H */ +#endif /* CVC4__THEORY__STRINGS__SKOLEM_CACHE_H */ diff --git a/src/theory/strings/theory_strings.h b/src/theory/strings/theory_strings.h index e9d82a7b2..8371a27ea 100644 --- a/src/theory/strings/theory_strings.h +++ b/src/theory/strings/theory_strings.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__STRINGS__THEORY_STRINGS_H -#define __CVC4__THEORY__STRINGS__THEORY_STRINGS_H +#ifndef CVC4__THEORY__STRINGS__THEORY_STRINGS_H +#define CVC4__THEORY__STRINGS__THEORY_STRINGS_H #include "context/cdhashset.h" #include "context/cdlist.h" @@ -1166,4 +1166,4 @@ private: }/* CVC4::theory namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__THEORY__STRINGS__THEORY_STRINGS_H */ +#endif /* CVC4__THEORY__STRINGS__THEORY_STRINGS_H */ diff --git a/src/theory/strings/theory_strings_preprocess.h b/src/theory/strings/theory_strings_preprocess.h index daa109682..b96d619ef 100644 --- a/src/theory/strings/theory_strings_preprocess.h +++ b/src/theory/strings/theory_strings_preprocess.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__STRINGS__PREPROCESS_H -#define __CVC4__THEORY__STRINGS__PREPROCESS_H +#ifndef CVC4__THEORY__STRINGS__PREPROCESS_H +#define CVC4__THEORY__STRINGS__PREPROCESS_H #include #include "context/cdhashmap.h" @@ -86,4 +86,4 @@ private: }/* CVC4::theory namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__THEORY__STRINGS__PREPROCESS_H */ +#endif /* CVC4__THEORY__STRINGS__PREPROCESS_H */ diff --git a/src/theory/strings/theory_strings_rewriter.h b/src/theory/strings/theory_strings_rewriter.h index 61031ea87..e8886d43b 100644 --- a/src/theory/strings/theory_strings_rewriter.h +++ b/src/theory/strings/theory_strings_rewriter.h @@ -15,8 +15,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__STRINGS__THEORY_STRINGS_REWRITER_H -#define __CVC4__THEORY__STRINGS__THEORY_STRINGS_REWRITER_H +#ifndef CVC4__THEORY__STRINGS__THEORY_STRINGS_REWRITER_H +#define CVC4__THEORY__STRINGS__THEORY_STRINGS_REWRITER_H #include #include @@ -751,4 +751,4 @@ class TheoryStringsRewriter { }/* CVC4::theory namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__THEORY__STRINGS__THEORY_STRINGS_REWRITER_H */ +#endif /* CVC4__THEORY__STRINGS__THEORY_STRINGS_REWRITER_H */ diff --git a/src/theory/strings/theory_strings_type_rules.h b/src/theory/strings/theory_strings_type_rules.h index 3ad28ee0f..91de8ac01 100644 --- a/src/theory/strings/theory_strings_type_rules.h +++ b/src/theory/strings/theory_strings_type_rules.h @@ -17,8 +17,8 @@ #include "cvc4_private.h" #include "options/strings_options.h" -#ifndef __CVC4__THEORY__STRINGS__THEORY_STRINGS_TYPE_RULES_H -#define __CVC4__THEORY__STRINGS__THEORY_STRINGS_TYPE_RULES_H +#ifndef CVC4__THEORY__STRINGS__THEORY_STRINGS_TYPE_RULES_H +#define CVC4__THEORY__STRINGS__THEORY_STRINGS_TYPE_RULES_H namespace CVC4 { namespace theory { @@ -490,4 +490,4 @@ public: }/* CVC4::theory namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__THEORY__STRINGS__THEORY_STRINGS_TYPE_RULES_H */ +#endif /* CVC4__THEORY__STRINGS__THEORY_STRINGS_TYPE_RULES_H */ diff --git a/src/theory/strings/type_enumerator.h b/src/theory/strings/type_enumerator.h index 7327042e2..5ca0b624d 100644 --- a/src/theory/strings/type_enumerator.h +++ b/src/theory/strings/type_enumerator.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__STRINGS__TYPE_ENUMERATOR_H -#define __CVC4__THEORY__STRINGS__TYPE_ENUMERATOR_H +#ifndef CVC4__THEORY__STRINGS__TYPE_ENUMERATOR_H +#define CVC4__THEORY__STRINGS__TYPE_ENUMERATOR_H #include @@ -128,4 +128,4 @@ class StringEnumeratorLength { }/* CVC4::theory namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__THEORY__STRINGS__TYPE_ENUMERATOR_H */ +#endif /* CVC4__THEORY__STRINGS__TYPE_ENUMERATOR_H */ -- cgit v1.2.3