Merge pull request #334 from peterschrammel/unify-header-guards

Make header guards uniform

src/aa-path-symex/build_goto_trace.h

@@ -6,8 +6,8 @@ Author: Daniel Kroening, [email protected]
 
 \*******************************************************************/
 
-#ifndef CPROVER_PATH_SYMEX_BUILD_GOTO_TRACE_H
-#define CPROVER_PATH_SYMEX_BUILD_GOTO_TRACE_H
+#ifndef CPROVER_AA_PATH_SYMEX_BUILD_GOTO_TRACE_H
+#define CPROVER_AA_PATH_SYMEX_BUILD_GOTO_TRACE_H
 
 #include <util/decision_procedure.h>
 #include <goto-programs/goto_trace.h>
@@ -19,4 +19,4 @@ void build_goto_trace(
   const decision_proceduret &decision_procedure,
   goto_tracet &goto_trace);
 
-#endif
+#endif // CPROVER_AA_PATH_SYMEX_BUILD_GOTO_TRACE_H

src/aa-path-symex/loc_ref.h

@@ -6,8 +6,8 @@ Author: Daniel Kroening, [email protected]
 
 \*******************************************************************/
 
-#ifndef CPROVER_LOC_REF_H
-#define CPROVER_LOC_REF_H
+#ifndef CPROVER_AA_PATH_SYMEX_LOC_REF_H
+#define CPROVER_AA_PATH_SYMEX_LOC_REF_H
 
 #include <ostream>
 
@@ -83,4 +83,4 @@ static inline std::ostream &operator << (std::ostream &out, loc_reft l)
     return out << l.loc_number;
 }
 
-#endif
+#endif // CPROVER_AA_PATH_SYMEX_LOC_REF_H

src/aa-path-symex/locs.h

@@ -6,8 +6,8 @@ Author: Daniel Kroening, [email protected]
 
 \*******************************************************************/
 
-#ifndef CPROVER_PATH_SYMEX_LOCS_H
-#define CPROVER_PATH_SYMEX_LOCS_H
+#ifndef CPROVER_AA_PATH_SYMEX_LOCS_H
+#define CPROVER_AA_PATH_SYMEX_LOCS_H
 
 #include <util/std_expr.h>
 
@@ -112,4 +112,4 @@ class target_to_loc_mapt
   for(exprt::operandst::iterator it=(expr).loc_vector.begin(); \
       it!=(locs).loc_vector.end(); it++)
 
-#endif
+#endif // CPROVER_AA_PATH_SYMEX_LOCS_H

src/aa-path-symex/path_symex.h

@@ -7,8 +7,8 @@ Author: Daniel Kroening, [email protected]
 
 \*******************************************************************/
 
-#ifndef CPROVER_PATH_SYMEX_H
-#define CPROVER_PATH_SYMEX_H
+#ifndef CPROVER_AA_PATH_SYMEX_PATH_SYMEX_H
+#define CPROVER_AA_PATH_SYMEX_PATH_SYMEX_H
 
 #include "locs.h"
 #include "path_symex_state.h"
@@ -39,4 +39,4 @@ void path_symex_goto(
 void path_symex_assert_fail(
   path_symex_statet &state);
 
-#endif
+#endif // CPROVER_AA_PATH_SYMEX_PATH_SYMEX_H

src/aa-path-symex/path_symex_history.h

@@ -6,8 +6,8 @@ Author: Daniel Kroening, [email protected]
 
 \*******************************************************************/
 
-#ifndef CPROVER_PATH_SYMEX_HISTORY_H
-#define CPROVER_PATH_SYMEX_HISTORY_H
+#ifndef CPROVER_AA_PATH_SYMEX_PATH_SYMEX_HISTORY_H
+#define CPROVER_AA_PATH_SYMEX_PATH_SYMEX_HISTORY_H
 
 #include <cassert>
 #include <limits>
@@ -161,4 +161,4 @@ inline void path_symex_step_reft::build_history(
   }
 }
 
-#endif
+#endif // CPROVER_AA_PATH_SYMEX_PATH_SYMEX_HISTORY_H

src/aa-path-symex/path_symex_state.h

@@ -7,8 +7,8 @@ Author: Daniel Kroening, [email protected]
 
 \*******************************************************************/
 
-#ifndef CPROVER_PATH_SYMEX_STATE_H
-#define CPROVER_PATH_SYMEX_STATE_H
+#ifndef CPROVER_AA_PATH_SYMEX_PATH_SYMEX_STATE_H
+#define CPROVER_AA_PATH_SYMEX_PATH_SYMEX_STATE_H
 
 #include <algorithm>
 
@@ -347,4 +347,4 @@ path_symex_statet initial_state(
   const locst &locs,
   path_symex_historyt &);
 
-#endif
+#endif // CPROVER_AA_PATH_SYMEX_PATH_SYMEX_STATE_H

src/aa-path-symex/var_map.h

@@ -6,8 +6,8 @@ Author: Daniel Kroening, [email protected]
 
 \*******************************************************************/
 
-#ifndef CPROVER_PATH_SYMEX_VAR_MAP_H
-#define CPROVER_PATH_SYMEX_VAR_MAP_H
+#ifndef CPROVER_AA_PATH_SYMEX_VAR_MAP_H
+#define CPROVER_AA_PATH_SYMEX_VAR_MAP_H
 
 #include <map>
 
@@ -118,4 +118,4 @@ class var_mapt
   unsigned dynamic_count; // memory allocation
 };
 
-#endif
+#endif // CPROVER_AA_PATH_SYMEX_VAR_MAP_H

src/aa-symex/path_search.h

@@ -7,8 +7,8 @@ Author: Daniel Kroening, [email protected]
 
 \*******************************************************************/
 
-#ifndef CPROVER_PATH_SEARCH_H
-#define CPROVER_PATH_SEARCH_H
+#ifndef CPROVER_AA_SYMEX_PATH_SEARCH_H
+#define CPROVER_AA_SYMEX_PATH_SEARCH_H
 
 #include <util/time_stopping.h>
 
@@ -91,4 +91,4 @@ class path_searcht:public safety_checkert
     const goto_functionst &goto_functions);
 };
 
-#endif
+#endif // CPROVER_AA_SYMEX_PATH_SEARCH_H

src/aa-symex/symex_parseoptions.h

@@ -6,8 +6,8 @@ Author: Daniel Kroening, [email protected]
 
 \*******************************************************************/
 
-#ifndef CPROVER_SYMEX_PARSEOPTIONS_H
-#define CPROVER_SYMEX_PARSEOPTIONS_H
+#ifndef CPROVER_AA_SYMEX_SYMEX_PARSEOPTIONS_H
+#define CPROVER_AA_SYMEX_SYMEX_PARSEOPTIONS_H
 
 #include <util/ui_message.h>
 #include <util/parseoptions.h>
@@ -75,4 +75,4 @@ class symex_parseoptionst:
   void eval_verbosity();
 };
 
-#endif
+#endif // CPROVER_AA_SYMEX_SYMEX_PARSEOPTIONS_H

src/analyses/ai.h

@@ -360,4 +360,4 @@ class concurrency_aware_ait:public ait<domainT>
   }
 };
 
-#endif
+#endif // CPROVER_ANALYSES_AI_H

src/analyses/call_graph.h

@@ -34,4 +34,4 @@ class call_grapht
            const goto_programt &body);
 };
 
-#endif
+#endif // CPROVER_ANALYSES_CALL_GRAPH_H

src/analyses/cfg_dominators.h

@@ -6,8 +6,8 @@ Author: Georg Weissenbacher, [email protected]
 
 \*******************************************************************/
 
-#ifndef CPROVER_CFG_DOMINATORS_H
-#define CPROVER_CFG_DOMINATORS_H
+#ifndef CPROVER_ANALYSES_CFG_DOMINATORS_H
+#define CPROVER_ANALYSES_CFG_DOMINATORS_H
 
 #include <set>
 #include <list>
@@ -251,4 +251,4 @@ typedef cfg_dominators_templatet<const goto_programt, goto_programt::const_targe
 typedef cfg_dominators_templatet<const goto_programt, goto_programt::const_targett, true>
         cfg_post_dominatorst;
 
-#endif
+#endif // CPROVER_ANALYSES_CFG_DOMINATORS_H

src/analyses/constant_propagator.h

@@ -6,8 +6,8 @@ Author: Peter Schrammel
 
 \*******************************************************************/
 
-#ifndef CPROVER_CONSTANT_PROPAGATOR_H
-#define CPROVER_CONSTANT_PROPAGATOR_H
+#ifndef CPROVER_ANALYSES_CONSTANT_PROPAGATOR_H
+#define CPROVER_ANALYSES_CONSTANT_PROPAGATOR_H
 
 #include "ai.h"
 
@@ -119,4 +119,4 @@ class constant_propagator_ait:public ait<constant_propagator_domaint>
     exprt &expr);
 };
 
-#endif
+#endif // CPROVER_ANALYSES_CONSTANT_PROPAGATOR_H

src/analyses/custom_bitvector_analysis.h

@@ -6,8 +6,8 @@ Author: Daniel Kroening, [email protected]
 
 \*******************************************************************/
 
-#ifndef CPROVER_CUSTOM_BITVECTOR_ANALYSIS_H
-#define CPROVER_CUSTOM_BITVECTOR_ANALYSIS_H
+#ifndef CPROVER_ANALYSES_CUSTOM_BITVECTOR_ANALYSIS_H
+#define CPROVER_ANALYSES_CUSTOM_BITVECTOR_ANALYSIS_H
 
 #include <util/numbering.h>
 
@@ -158,4 +158,4 @@ class custom_bitvector_analysist:public ait<custom_bitvector_domaint>
   std::set<exprt> aliases(const exprt &, locationt loc);
 };
 
-#endif
+#endif // CPROVER_ANALYSES_CUSTOM_BITVECTOR_ANALYSIS_H

src/analyses/dependence_graph.h

@@ -9,8 +9,8 @@ Date: August 2013
 
 \*******************************************************************/
 
-#ifndef CPROVER_DEPENDENCE_GRAPH_H
-#define CPROVER_DEPENDENCE_GRAPH_H
+#ifndef CPROVER_ANALYSES_DEPENDENCE_GRAPH_H
+#define CPROVER_ANALYSES_DEPENDENCE_GRAPH_H
 
 #include <util/graph.h>
 
@@ -176,4 +176,4 @@ class dependence_grapht:
   reaching_definitions_analysist rd;
 };
 
-#endif
+#endif // CPROVER_ANALYSES_DEPENDENCE_GRAPH_H

src/analyses/dirty.h

@@ -8,8 +8,8 @@ Date: March 2013
 
 \*******************************************************************/
 
-#ifndef CPROVER_DIRTY_H
-#define CPROVER_DIRTY_H
+#ifndef CPROVER_ANALYSES_DIRTY_H
+#define CPROVER_ANALYSES_DIRTY_H
 
 #include <util/std_expr.h>
 #include <goto-programs/goto_functions.h>
@@ -65,4 +65,4 @@ static inline std::ostream &operator << (
   return out;
 }
 
-#endif
+#endif // CPROVER_ANALYSES_DIRTY_H

src/analyses/escape_analysis.h

@@ -7,8 +7,8 @@ Author: Daniel Kroening, [email protected]
 
 \*******************************************************************/
 
-#ifndef CPROVER_ESCAPE_ANALYSIS_H
-#define CPROVER_ESCAPE_ANALYSIS_H
+#ifndef CPROVER_ANALYSES_ESCAPE_ANALYSIS_H
+#define CPROVER_ANALYSES_ESCAPE_ANALYSIS_H
 
 #include <util/numbering.h>
 #include <util/union_find.h>
@@ -112,4 +112,4 @@ class escape_analysist:public ait<escape_domaint>
     const namespacet &);
 };
 
-#endif
+#endif // CPROVER_ANALYSES_ESCAPE_ANALYSIS_H

src/analyses/flow_insensitive_analysis.h

@@ -7,8 +7,8 @@ Author: Daniel Kroening, [email protected]
 
 \*******************************************************************/
 
-#ifndef FLOW_INSENSITIVE_ANALYSIS_H_
-#define FLOW_INSENSITIVE_ANALYSIS_H_
+#ifndef CPROVER_ANALYSES_FLOW_INSENSITIVE_ANALYSIS_H
+#define CPROVER_ANALYSES_FLOW_INSENSITIVE_ANALYSIS_H
 
 #include <queue>
 #include <map>
@@ -259,4 +259,4 @@ class flow_insensitive_analysist:public flow_insensitive_analysis_baset
   void dummy(const T &s) { const statet &x=dummy1(s); (void)x; }
 };
 
-#endif /*FLOW_INSENSITIVE_ANALYSIS_H_*/
+#endif // CPROVER_ANALYSES_FLOW_INSENSITIVE_ANALYSIS_H

src/analyses/global_may_alias.h

@@ -7,8 +7,8 @@ Author: Daniel Kroening, [email protected]
 
 \*******************************************************************/
 
-#ifndef CPROVER_GLOBAL_MAY_ALIAS_H
-#define CPROVER_GLOBAL_MAY_ALIAS_H
+#ifndef CPROVER_ANALYSES_GLOBAL_MAY_ALIAS_H
+#define CPROVER_ANALYSES_GLOBAL_MAY_ALIAS_H
 
 #include <util/numbering.h>
 #include <util/union_find.h>
@@ -71,4 +71,4 @@ class global_may_alias_analysist:public ait<global_may_alias_domaint>
   }
 };
 
-#endif
+#endif // CPROVER_ANALYSES_GLOBAL_MAY_ALIAS_H

src/analyses/goto_check.h

@@ -6,8 +6,8 @@ Author: Daniel Kroening, [email protected]
 
 \*******************************************************************/
 
-#ifndef CPROVER_GOTO_PROGRAMS_GOTO_CHECK_H
-#define CPROVER_GOTO_PROGRAMS_GOTO_CHECK_H
+#ifndef CPROVER_ANALYSES_GOTO_CHECK_H
+#define CPROVER_ANALYSES_GOTO_CHECK_H
 
 #include <goto-programs/goto_functions.h>
 #include <goto-programs/goto_model.h>
@@ -61,4 +61,4 @@ void goto_check(
   options.set_option("float-overflow-check", cmdline.isset("float-overflow-check")); \
   options.set_option("nan-check", cmdline.isset("nan-check"))
 
-#endif
+#endif // CPROVER_ANALYSES_GOTO_CHECK_H

src/analyses/goto_rw.h

@@ -8,8 +8,8 @@ Date: April 2010
 
 \*******************************************************************/
 
-#ifndef CPROVER_GOTO_PROGRAMS_GOTO_RW_H
-#define CPROVER_GOTO_PROGRAMS_GOTO_RW_H
+#ifndef CPROVER_ANALYSES_GOTO_RW_H
+#define CPROVER_ANALYSES_GOTO_RW_H
 
 #include <map>
 #include <ostream>
@@ -307,4 +307,4 @@ class rw_guarded_range_set_value_sett:public rw_range_set_value_sett
     const range_spect &range_end);
 };
 
-#endif
+#endif // CPROVER_ANALYSES_GOTO_RW_H

src/analyses/interval_analysis.h

@@ -6,8 +6,8 @@ Author: Daniel Kroening, [email protected]
 
 \*******************************************************************/
 
-#ifndef CPROVER_INTERVAL_ANALYSIS_H
-#define CPROVER_INTERVAL_ANALYSIS_H
+#ifndef CPROVER_ANALYSES_INTERVAL_ANALYSIS_H
+#define CPROVER_ANALYSES_INTERVAL_ANALYSIS_H
 
 #include <util/namespace.h>
 #include <goto-programs/goto_functions.h>
@@ -16,4 +16,4 @@ void interval_analysis(
   const namespacet &ns,
   goto_functionst &goto_functions);
 
-#endif
+#endif // CPROVER_ANALYSES_INTERVAL_ANALYSIS_H

src/analyses/interval_domain.h

@@ -6,8 +6,8 @@ Author: Daniel Kroening, [email protected]
 
 \*******************************************************************/
 
-#ifndef CPROVER_INTERVAL_DOMAIN_H
-#define CPROVER_INTERVAL_DOMAIN_H
+#ifndef CPROVER_ANALYSES_INTERVAL_DOMAIN_H
+#define CPROVER_ANALYSES_INTERVAL_DOMAIN_H
 
 #include <util/ieee_float.h>
 #include <util/mp_arith.h>
@@ -93,4 +93,4 @@ class interval_domaint:public ai_domain_baset
   ieee_float_intervalt get_float_rec(const exprt &);
 };
 
-#endif
+#endif // CPROVER_ANALYSES_INTERVAL_DOMAIN_H

src/analyses/invariant_propagation.h

@@ -6,8 +6,8 @@ Author: Daniel Kroening, [email protected]
 
 \*******************************************************************/
 
-#ifndef CPROVER_CEGAR_INVARIANT_PROPAGATION_H
-#define CPROVER_CEGAR_INVARIANT_PROPAGATION_H
+#ifndef CPROVER_ANALYSES_INVARIANT_PROPAGATION_H
+#define CPROVER_ANALYSES_INVARIANT_PROPAGATION_H
 
 #include <pointer-analysis/value_sets.h>
 
@@ -68,4 +68,4 @@ class invariant_propagationt:public
   bool check_type(const typet &type) const;
 };
 
-#endif
+#endif // CPROVER_ANALYSES_INVARIANT_PROPAGATION_H