From: Morgan Deters <mdeters@gmail.com>
Date: Thu, 4 Feb 2010 22:10:47 +0000 (+0000)
Subject: remove -*- c++ -*- emacs tag from source files (it overrides cvc4-c++-editing-mode... 
X-Git-Tag: cvc5-1.0.0~9286
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=de96bc814a6dd3b619bf247e8e83375d0ae7d595;p=cvc5.git

remove -*- c++ -*- emacs tag from source files (it overrides cvc4-c++-editing-mode from contrib/editing-with-emacs
---

diff --git a/contrib/update-copyright.pl b/contrib/update-copyright.pl
index c9a4fe05a..22128ea6d 100755
--- a/contrib/update-copyright.pl
+++ b/contrib/update-copyright.pl
@@ -117,14 +117,14 @@ sub recurse {
       if(m,^(%{)?/\*(\*| )\*\*\*,) {
         print "updating\n";
         if($file =~ /\.(y|yy|ypp|Y)$/) {
-          print $OUT "%{/*******************                                           -*- C++ -*-  */\n";
+          print $OUT "%{/*******************                                                        */\n";
           print $OUT "/** $file\n";
         } elsif($file =~ /\.g$/) {
           # avoid javadoc-style comment here; antlr complains
-          print $OUT "/* *******************                                           -*- C++ -*-  */\n";
+          print $OUT "/* *******************                                                        */\n";
           print $OUT "/*  $file\n";
         } else {
-          print $OUT "/*********************                                           -*- C++ -*-  */\n";
+          print $OUT "/*********************                                                        */\n";
           print $OUT "/** $file\n";
         }
         print $OUT " ** Original author: $author\n";
@@ -139,14 +139,14 @@ sub recurse {
         my $line = $_;
         print "adding\n";
         if($file =~ /\.(y|yy|ypp|Y)$/) {
-          print $OUT "%{/*******************                                           -*- C++ -*-  */\n";
+          print $OUT "%{/*******************                                                        */\n";
           print $OUT "/** $file\n";
         } elsif($file =~ /\.g$/) {
           # avoid javadoc-style comment here; antlr complains
-          print $OUT "/* *******************                                           -*- C++ -*-  */\n";
+          print $OUT "/* *******************                                                        */\n";
           print $OUT "/*  $file\n";
         } else {
-          print $OUT "/*********************                                           -*- C++ -*-  */\n";
+          print $OUT "/*********************                                                        */\n";
           print $OUT "/** $file\n";
         }
         print $OUT " ** Original author: $author\n";
diff --git a/src/context/context.cpp b/src/context/context.cpp
index 487dd97f8..5d8ea933b 100644
--- a/src/context/context.cpp
+++ b/src/context/context.cpp
@@ -1,4 +1,4 @@
-/*********************                                           -*- C++ -*-  */
+/*********************                                                        */
 /** context.cpp
  ** Original author: mdeters
  ** Major contributors: barrett
diff --git a/src/context/context.h b/src/context/context.h
index 9e1eba644..244a8b792 100644
--- a/src/context/context.h
+++ b/src/context/context.h
@@ -1,4 +1,4 @@
-/*********************                                           -*- C++ -*-  */
+/*********************                                                        */
 /** context.h
  ** Original author: mdeters
  ** Major contributors: barrett
diff --git a/src/context/context_mm.cpp b/src/context/context_mm.cpp
index bc8e8772f..df7d82987 100644
--- a/src/context/context_mm.cpp
+++ b/src/context/context_mm.cpp
@@ -1,4 +1,4 @@
-/*********************                                           -*- C++ -*-  */
+/*********************                                                        */
 /** context_mm.cpp
  ** Original author: barrett
  ** Major contributors: mdeters
diff --git a/src/context/context_mm.h b/src/context/context_mm.h
index 45b2539ca..c51498979 100644
--- a/src/context/context_mm.h
+++ b/src/context/context_mm.h
@@ -1,4 +1,4 @@
-/*********************                                           -*- C++ -*-  */
+/*********************                                                        */
 /** context_mm.h
  ** Original author: barrett
  ** Major contributors: none
diff --git a/src/expr/attr_type.h b/src/expr/attr_type.h
index 966d69081..f19491b70 100644
--- a/src/expr/attr_type.h
+++ b/src/expr/attr_type.h
@@ -1,4 +1,4 @@
-/*********************                                           -*- C++ -*-  */
+/*********************                                                        */
 /** attr_type.h
  ** Original author: mdeters
  ** Major contributors: none
diff --git a/src/expr/attr_var_name.h b/src/expr/attr_var_name.h
index 30f67fcf9..b3267c7dc 100644
--- a/src/expr/attr_var_name.h
+++ b/src/expr/attr_var_name.h
@@ -1,4 +1,4 @@
-/*********************                                           -*- C++ -*-  */
+/*********************                                                        */
 /** attr_var_name.h
  ** Original author: mdeters
  ** Major contributors: none
diff --git a/src/expr/command.cpp b/src/expr/command.cpp
index 2f8dd789e..a7b15f05e 100644
--- a/src/expr/command.cpp
+++ b/src/expr/command.cpp
@@ -1,4 +1,4 @@
-/*********************                                           -*- C++ -*-  */
+/*********************                                                        */
 /** command.cpp
  ** Original author: mdeters
  ** Major contributors: dejan
diff --git a/src/expr/command.h b/src/expr/command.h
index dedefb782..923af0a4d 100644
--- a/src/expr/command.h
+++ b/src/expr/command.h
@@ -1,4 +1,4 @@
-/*********************                                           -*- C++ -*-  */
+/*********************                                                        */
 /** command.h
  ** Original author: mdeters
  ** Major contributors: dejan
diff --git a/src/expr/expr.cpp b/src/expr/expr.cpp
index 1df4012a6..283467fa8 100644
--- a/src/expr/expr.cpp
+++ b/src/expr/expr.cpp
@@ -1,4 +1,4 @@
-/*********************                                           -*- C++ -*-  */
+/*********************                                                        */
 /** expr.cpp
  ** Original author: dejan
  ** Major contributors: taking
diff --git a/src/expr/expr.h b/src/expr/expr.h
index 2210a6c0a..6e4a43d21 100644
--- a/src/expr/expr.h
+++ b/src/expr/expr.h
@@ -1,4 +1,4 @@
-/*********************                                           -*- C++ -*-  */
+/*********************                                                        */
 /** expr.h
  ** Original author: dejan
  ** Major contributors: none
diff --git a/src/expr/expr_manager.cpp b/src/expr/expr_manager.cpp
index 5b5f962bd..d81466305 100644
--- a/src/expr/expr_manager.cpp
+++ b/src/expr/expr_manager.cpp
@@ -1,4 +1,4 @@
-/*********************                                           -*- C++ -*-  */
+/*********************                                                        */
 /** expr_manager.cpp
  ** Original author: dejan
  ** Major contributors: mdeters
diff --git a/src/expr/expr_manager.h b/src/expr/expr_manager.h
index 97f2cd24d..32aa41dfe 100644
--- a/src/expr/expr_manager.h
+++ b/src/expr/expr_manager.h
@@ -1,4 +1,4 @@
-/*********************                                           -*- C++ -*-  */
+/*********************                                                        */
 /** expr_manager.h
  ** Original author: dejan
  ** Major contributors: mdeters
diff --git a/src/expr/kind_epilogue.h b/src/expr/kind_epilogue.h
index 06f92261b..3d029bec4 100644
--- a/src/expr/kind_epilogue.h
+++ b/src/expr/kind_epilogue.h
@@ -1,6 +1,6 @@
-/*********************                                           -*- C++ -*-  */
+/*********************                                                        */
 /** kind_epilogue.h
- ** Original author: 
+ ** Original author: mdeters
  ** Major contributors: none
  ** Minor contributors (to current version): none
  ** This file is part of the CVC4 prototype.
diff --git a/src/expr/kind_middle.h b/src/expr/kind_middle.h
index 7dee40853..c34697cac 100644
--- a/src/expr/kind_middle.h
+++ b/src/expr/kind_middle.h
@@ -1,6 +1,6 @@
-/*********************                                           -*- C++ -*-  */
+/*********************                                                        */
 /** kind_middle.h
- ** Original author: 
+ ** Original author: mdeters
  ** Major contributors: none
  ** Minor contributors (to current version): none
  ** This file is part of the CVC4 prototype.
diff --git a/src/expr/kind_prologue.h b/src/expr/kind_prologue.h
index bdc0ff599..53df4a590 100644
--- a/src/expr/kind_prologue.h
+++ b/src/expr/kind_prologue.h
@@ -1,6 +1,6 @@
-/*********************                                           -*- C++ -*-  */
+/*********************                                                        */
 /** kind_prologue.h
- ** Original author: 
+ ** Original author: mdeters
  ** Major contributors: none
  ** Minor contributors (to current version): none
  ** This file is part of the CVC4 prototype.
diff --git a/src/expr/node.cpp b/src/expr/node.cpp
index 8092348fe..72ad61e95 100644
--- a/src/expr/node.cpp
+++ b/src/expr/node.cpp
@@ -1,4 +1,4 @@
-/*********************                                           -*- C++ -*-  */
+/*********************                                                        */
 /** node.cpp
  ** Original author: mdeters
  ** Major contributors: taking, dejan
diff --git a/src/expr/node.h b/src/expr/node.h
index 1d47f676b..63bacaa52 100644
--- a/src/expr/node.h
+++ b/src/expr/node.h
@@ -1,4 +1,4 @@
-/*********************                                           -*- C++ -*-  */
+/*********************                                                        */
 /** node.h
  ** Original author: mdeters
  ** Major contributors: dejan
diff --git a/src/expr/node_attribute.h b/src/expr/node_attribute.h
index 0d00a300f..f43013a27 100644
--- a/src/expr/node_attribute.h
+++ b/src/expr/node_attribute.h
@@ -1,4 +1,4 @@
-/*********************                                           -*- C++ -*-  */
+/*********************                                                        */
 /** node_attribute.h
  ** Original author: mdeters
  ** Major contributors: dejan
diff --git a/src/expr/node_builder.cpp b/src/expr/node_builder.cpp
index 3629815b6..7b78093c9 100644
--- a/src/expr/node_builder.cpp
+++ b/src/expr/node_builder.cpp
@@ -1,4 +1,4 @@
-/*********************                                           -*- C++ -*-  */
+/*********************                                                        */
 /** node_builder.cpp
  ** Original author: mdeters
  ** Major contributors: none
diff --git a/src/expr/node_builder.h b/src/expr/node_builder.h
index 1411024a9..23a4c6f84 100644
--- a/src/expr/node_builder.h
+++ b/src/expr/node_builder.h
@@ -1,4 +1,4 @@
-/*********************                                           -*- C++ -*-  */
+/*********************                                                        */
 /** node_builder.h
  ** Original author: mdeters
  ** Major contributors: none
diff --git a/src/expr/node_manager.cpp b/src/expr/node_manager.cpp
index df49800b6..e9fdc69a8 100644
--- a/src/expr/node_manager.cpp
+++ b/src/expr/node_manager.cpp
@@ -1,4 +1,4 @@
-/*********************                                           -*- C++ -*-  */
+/*********************                                                        */
 /** node_manager.cpp
  ** Original author: mdeters
  ** Major contributors: none
diff --git a/src/expr/node_manager.h b/src/expr/node_manager.h
index 3c8dbdea7..090398ce8 100644
--- a/src/expr/node_manager.h
+++ b/src/expr/node_manager.h
@@ -1,4 +1,4 @@
-/*********************                                           -*- C++ -*-  */
+/*********************                                                        */
 /** node_manager.h
  ** Original author: mdeters
  ** Major contributors: none
diff --git a/src/expr/node_value.cpp b/src/expr/node_value.cpp
index 781747542..575ab7d37 100644
--- a/src/expr/node_value.cpp
+++ b/src/expr/node_value.cpp
@@ -1,4 +1,4 @@
-/*********************                                           -*- C++ -*-  */
+/*********************                                                        */
 /** node_value.cpp
  ** Original author: mdeters
  ** Major contributors: none
diff --git a/src/expr/node_value.h b/src/expr/node_value.h
index bf8b7cd79..bb224e3b1 100644
--- a/src/expr/node_value.h
+++ b/src/expr/node_value.h
@@ -1,4 +1,4 @@
-/*********************                                           -*- C++ -*-  */
+/*********************                                                        */
 /** node_value.h
  ** Original author: mdeters
  ** Major contributors: dejan
diff --git a/src/include/cvc4_config.h b/src/include/cvc4_config.h
index bda26ebe0..593e7a5e3 100644
--- a/src/include/cvc4_config.h
+++ b/src/include/cvc4_config.h
@@ -1,4 +1,4 @@
-/*********************                                           -*- C++ -*-  */
+/*********************                                                        */
 /** cvc4_config.h
  ** Original author: mdeters
  ** Major contributors: none
diff --git a/src/main/about.h b/src/main/about.h
index a30cffd39..9dacdc8cc 100644
--- a/src/main/about.h
+++ b/src/main/about.h
@@ -1,4 +1,4 @@
-/*********************                                           -*- C++ -*-  */
+/*********************                                                        */
 /** about.h
  ** Original author: mdeters
  ** Major contributors: none
diff --git a/src/main/getopt.cpp b/src/main/getopt.cpp
index f4d32cd68..0c041b05e 100644
--- a/src/main/getopt.cpp
+++ b/src/main/getopt.cpp
@@ -1,4 +1,4 @@
-/*********************                                           -*- C++ -*-  */
+/*********************                                                        */
 /** getopt.cpp
  ** Original author: mdeters
  ** Major contributors: none
diff --git a/src/main/main.cpp b/src/main/main.cpp
index d4b40c12d..bb38c6147 100644
--- a/src/main/main.cpp
+++ b/src/main/main.cpp
@@ -1,4 +1,4 @@
-/*********************                                           -*- C++ -*-  */
+/*********************                                                        */
 /** main.cpp
  ** Original author: mdeters
  ** Major contributors: barrett, dejan
diff --git a/src/main/main.h b/src/main/main.h
index 0c78912ae..405b22363 100644
--- a/src/main/main.h
+++ b/src/main/main.h
@@ -1,4 +1,4 @@
-/*********************                                           -*- C++ -*-  */
+/*********************                                                        */
 /** main.h
  ** Original author: mdeters
  ** Major contributors: none
diff --git a/src/main/usage.h b/src/main/usage.h
index 6927f0f2f..f13c4aebe 100644
--- a/src/main/usage.h
+++ b/src/main/usage.h
@@ -1,4 +1,4 @@
-/*********************                                           -*- C++ -*-  */
+/*********************                                                        */
 /** usage.h
  ** Original author: mdeters
  ** Major contributors: none
diff --git a/src/main/util.cpp b/src/main/util.cpp
index 03ae26092..adb117b9d 100644
--- a/src/main/util.cpp
+++ b/src/main/util.cpp
@@ -1,4 +1,4 @@
-/*********************                                           -*- C++ -*-  */
+/*********************                                                        */
 /** util.cpp
  ** Original author: mdeters
  ** Major contributors: none
diff --git a/src/parser/antlr_parser.cpp b/src/parser/antlr_parser.cpp
index 58f1babd0..34691dc33 100644
--- a/src/parser/antlr_parser.cpp
+++ b/src/parser/antlr_parser.cpp
@@ -1,4 +1,4 @@
-/*********************                                           -*- C++ -*-  */
+/*********************                                                        */
 /** antlr_parser.cpp
  ** Original author: dejan
  ** Major contributors: mdeters, cconway
diff --git a/src/parser/antlr_parser.h b/src/parser/antlr_parser.h
index aa32e4193..5a7291be6 100644
--- a/src/parser/antlr_parser.h
+++ b/src/parser/antlr_parser.h
@@ -1,4 +1,4 @@
-/*********************                                           -*- C++ -*-  */
+/*********************                                                        */
 /** antlr_parser.h
  ** Original author: dejan
  ** Major contributors: cconway
diff --git a/src/parser/cvc/cvc_lexer.g b/src/parser/cvc/cvc_lexer.g
index 2452b1002..afcc7597d 100644
--- a/src/parser/cvc/cvc_lexer.g
+++ b/src/parser/cvc/cvc_lexer.g
@@ -1,4 +1,4 @@
-/* *******************                                           -*- C++ -*-  */
+/* *******************                                                        */
 /*  cvc_lexer.g
  ** Original author: dejan
  ** Major contributors: mdeters
diff --git a/src/parser/cvc/cvc_parser.g b/src/parser/cvc/cvc_parser.g
index 9a77ea178..662888050 100644
--- a/src/parser/cvc/cvc_parser.g
+++ b/src/parser/cvc/cvc_parser.g
@@ -1,4 +1,4 @@
-/* *******************                                           -*- C++ -*-  */
+/* *******************                                                        */
 /*  cvc_parser.g
  ** Original author: dejan
  ** Major contributors: mdeters
diff --git a/src/parser/parser.cpp b/src/parser/parser.cpp
index 71f38e87f..ef23d3883 100644
--- a/src/parser/parser.cpp
+++ b/src/parser/parser.cpp
@@ -1,4 +1,4 @@
-/*********************                                           -*- C++ -*-  */
+/*********************                                                        */
 /** parser.cpp
  ** Original author: mdeters
  ** Major contributors: dejan
diff --git a/src/parser/parser.h b/src/parser/parser.h
index 98c7267c6..bc4fd6018 100644
--- a/src/parser/parser.h
+++ b/src/parser/parser.h
@@ -1,4 +1,4 @@
-/*********************                                           -*- C++ -*-  */
+/*********************                                                        */
 /** parser.h
  ** Original author: mdeters
  ** Major contributors: dejan
diff --git a/src/parser/parser_exception.h b/src/parser/parser_exception.h
index 85d50ba51..e30398824 100644
--- a/src/parser/parser_exception.h
+++ b/src/parser/parser_exception.h
@@ -1,4 +1,4 @@
-/*********************                                           -*- C++ -*-  */
+/*********************                                                        */
 /** parser_exception.h
  ** Original author: mdeters
  ** Major contributors: none
diff --git a/src/parser/smt/smt_lexer.g b/src/parser/smt/smt_lexer.g
index 6c7e4be9d..d71edfbc3 100644
--- a/src/parser/smt/smt_lexer.g
+++ b/src/parser/smt/smt_lexer.g
@@ -1,4 +1,4 @@
-/* *******************                                           -*- C++ -*-  */
+/* *******************                                                        */
 /*  smt_lexer.g
  ** Original author: dejan
  ** Major contributors: cconway, mdeters
diff --git a/src/parser/smt/smt_parser.g b/src/parser/smt/smt_parser.g
index 8bc557bbd..47e275171 100644
--- a/src/parser/smt/smt_parser.g
+++ b/src/parser/smt/smt_parser.g
@@ -1,4 +1,4 @@
-/* *******************                                           -*- C++ -*-  */
+/* *******************                                                        */
 /*  smt_parser.g
  ** Original author: dejan
  ** Major contributors: mdeters, cconway
diff --git a/src/prop/cnf_conversion.h b/src/prop/cnf_conversion.h
index 0adbda2db..4ddfd3c06 100644
--- a/src/prop/cnf_conversion.h
+++ b/src/prop/cnf_conversion.h
@@ -1,8 +1,8 @@
-/*********************                                           -*- C++ -*-  */
+/*********************                                                        */
 /** cnf_conversion.h
  ** Original author: taking
  ** Major contributors: none
- ** Minor contributors (to current version): dejan
+ ** Minor contributors (to current version): dejan, mdeters
  ** This file is part of the CVC4 prototype.
  ** Copyright (c) 2009, 2010  The Analysis of Computer Systems Group (ACSys)
  ** Courant Institute of Mathematical Sciences
diff --git a/src/prop/cnf_stream.cpp b/src/prop/cnf_stream.cpp
index cf013363b..e333543b4 100644
--- a/src/prop/cnf_stream.cpp
+++ b/src/prop/cnf_stream.cpp
@@ -1,8 +1,8 @@
-/*********************                                           -*- C++ -*-  */
+/*********************                                                        */
 /** cnf_stream.cpp
  ** Original author: taking
  ** Major contributors: dejan
- ** Minor contributors (to current version): none
+ ** Minor contributors (to current version): mdeters
  ** This file is part of the CVC4 prototype.
  ** Copyright (c) 2009, 2010  The Analysis of Computer Systems Group (ACSys)
  ** Courant Institute of Mathematical Sciences
diff --git a/src/prop/cnf_stream.h b/src/prop/cnf_stream.h
index ca2e6dedd..97f1ee801 100644
--- a/src/prop/cnf_stream.h
+++ b/src/prop/cnf_stream.h
@@ -1,8 +1,8 @@
-/*********************                                           -*- C++ -*-  */
+/*********************                                                        */
 /** cnf_stream.h
  ** Original author: taking
  ** Major contributors: dejan
- ** Minor contributors (to current version): none
+ ** Minor contributors (to current version): mdeters
  ** This file is part of the CVC4 prototype.
  ** Copyright (c) 2009, 2010  The Analysis of Computer Systems Group (ACSys)
  ** Courant Institute of Mathematical Sciences
diff --git a/src/prop/prop_engine.cpp b/src/prop/prop_engine.cpp
index a206a8343..ad38c2a1f 100644
--- a/src/prop/prop_engine.cpp
+++ b/src/prop/prop_engine.cpp
@@ -1,4 +1,4 @@
-/*********************                                           -*- C++ -*-  */
+/*********************                                                        */
 /** prop_engine.cpp
  ** Original author: mdeters
  ** Major contributors: taking
diff --git a/src/prop/prop_engine.h b/src/prop/prop_engine.h
index b2355ee38..afeee3a41 100644
--- a/src/prop/prop_engine.h
+++ b/src/prop/prop_engine.h
@@ -1,4 +1,4 @@
-/*********************                                           -*- C++ -*-  */
+/*********************                                                        */
 /** prop_engine.h
  ** Original author: mdeters
  ** Major contributors: taking
diff --git a/src/prop/sat.h b/src/prop/sat.h
index 9a22dfb29..679b9da8c 100644
--- a/src/prop/sat.h
+++ b/src/prop/sat.h
@@ -1,4 +1,4 @@
-/*********************                                           -*- C++ -*-  */
+/*********************                                                        */
 /** sat.h
  ** Original author: mdeters
  ** Major contributors: none
diff --git a/src/smt/smt_engine.cpp b/src/smt/smt_engine.cpp
index 09790882c..1555acb7d 100644
--- a/src/smt/smt_engine.cpp
+++ b/src/smt/smt_engine.cpp
@@ -1,4 +1,4 @@
-/*********************                                           -*- C++ -*-  */
+/*********************                                                        */
 /** smt_engine.cpp
  ** Original author: mdeters
  ** Major contributors: dejan
diff --git a/src/smt/smt_engine.h b/src/smt/smt_engine.h
index 904275c49..79a35a6a1 100644
--- a/src/smt/smt_engine.h
+++ b/src/smt/smt_engine.h
@@ -1,4 +1,4 @@
-/*********************                                           -*- C++ -*-  */
+/*********************                                                        */
 /** smt_engine.h
  ** Original author: mdeters
  ** Major contributors: dejan
diff --git a/src/theory/interrupted.h b/src/theory/interrupted.h
index 17b54adda..f7a269f0b 100644
--- a/src/theory/interrupted.h
+++ b/src/theory/interrupted.h
@@ -1,4 +1,4 @@
-/*********************                                           -*- C++ -*-  */
+/*********************                                                        */
 /** interrupted.h
  ** Original author: mdeters
  ** Major contributors: none
diff --git a/src/theory/output_channel.h b/src/theory/output_channel.h
index 298be12bf..cec499a13 100644
--- a/src/theory/output_channel.h
+++ b/src/theory/output_channel.h
@@ -1,4 +1,4 @@
-/*********************                                           -*- C++ -*-  */
+/*********************                                                        */
 /** output_channel.h
  ** Original author: mdeters
  ** Major contributors: none
diff --git a/src/theory/theory.cpp b/src/theory/theory.cpp
index 2972b4722..61b2fdfa3 100644
--- a/src/theory/theory.cpp
+++ b/src/theory/theory.cpp
@@ -1,4 +1,4 @@
-/*********************                                           -*- C++ -*-  */
+/*********************                                                        */
 /** theory.cpp
  ** Original author: mdeters
  ** Major contributors: none
diff --git a/src/theory/theory.h b/src/theory/theory.h
index dc862197e..8daa0149f 100644
--- a/src/theory/theory.h
+++ b/src/theory/theory.h
@@ -1,4 +1,4 @@
-/*********************                                           -*- C++ -*-  */
+/*********************                                                        */
 /** theory.h
  ** Original author: mdeters
  ** Major contributors: none
diff --git a/src/theory/theory_engine.cpp b/src/theory/theory_engine.cpp
index 81bb38e68..58a59d321 100644
--- a/src/theory/theory_engine.cpp
+++ b/src/theory/theory_engine.cpp
@@ -1,4 +1,4 @@
-/*********************                                           -*- C++ -*-  */
+/*********************                                                        */
 /** theory_engine.cpp
  ** Original author: mdeters
  ** Major contributors: none
diff --git a/src/theory/theory_engine.h b/src/theory/theory_engine.h
index b4a9f8f91..3fb11b510 100644
--- a/src/theory/theory_engine.h
+++ b/src/theory/theory_engine.h
@@ -1,4 +1,4 @@
-/*********************                                           -*- C++ -*-  */
+/*********************                                                        */
 /** theory_engine.h
  ** Original author: mdeters
  ** Major contributors: none
diff --git a/src/util/Assert.cpp b/src/util/Assert.cpp
index c798b3d0a..8e2dd9220 100644
--- a/src/util/Assert.cpp
+++ b/src/util/Assert.cpp
@@ -1,4 +1,4 @@
-/*********************                                           -*- C++ -*-  */
+/*********************                                                        */
 /** Assert.cpp
  ** Original author: mdeters
  ** Major contributors: none
diff --git a/src/util/Assert.h b/src/util/Assert.h
index 7d2785d73..8f03ecd45 100644
--- a/src/util/Assert.h
+++ b/src/util/Assert.h
@@ -1,4 +1,4 @@
-/*********************                                           -*- C++ -*-  */
+/*********************                                                        */
 /** Assert.h
  ** Original author: mdeters
  ** Major contributors: none
diff --git a/src/util/debug.h b/src/util/debug.h
index e99b1c48a..13b097955 100644
--- a/src/util/debug.h
+++ b/src/util/debug.h
@@ -1,4 +1,4 @@
-/*********************                                           -*- C++ -*-  */
+/*********************                                                        */
 /** debug.h
  ** Original author: mdeters
  ** Major contributors: none
diff --git a/src/util/decision_engine.cpp b/src/util/decision_engine.cpp
index b163879b8..92e4c4f8c 100644
--- a/src/util/decision_engine.cpp
+++ b/src/util/decision_engine.cpp
@@ -1,4 +1,4 @@
-/*********************                                           -*- C++ -*-  */
+/*********************                                                        */
 /** decision_engine.cpp
  ** Original author: mdeters
  ** Major contributors: none
diff --git a/src/util/decision_engine.h b/src/util/decision_engine.h
index a2392c104..801daa863 100644
--- a/src/util/decision_engine.h
+++ b/src/util/decision_engine.h
@@ -1,4 +1,4 @@
-/*********************                                           -*- C++ -*-  */
+/*********************                                                        */
 /** decision_engine.h
  ** Original author: mdeters
  ** Major contributors: none
diff --git a/src/util/exception.h b/src/util/exception.h
index 8401b041e..b77e7c860 100644
--- a/src/util/exception.h
+++ b/src/util/exception.h
@@ -1,4 +1,4 @@
-/*********************                                           -*- C++ -*-  */
+/*********************                                                        */
 /** exception.h
  ** Original author: mdeters
  ** Major contributors: none
diff --git a/src/util/literal.h b/src/util/literal.h
index b246d1289..582c8a646 100644
--- a/src/util/literal.h
+++ b/src/util/literal.h
@@ -1,4 +1,4 @@
-/*********************                                           -*- C++ -*-  */
+/*********************                                                        */
 /** literal.h
  ** Original author: mdeters
  ** Major contributors: none
diff --git a/src/util/model.h b/src/util/model.h
index 2d2419d0f..65c919dd2 100644
--- a/src/util/model.h
+++ b/src/util/model.h
@@ -1,4 +1,4 @@
-/*********************                                           -*- C++ -*-  */
+/*********************                                                        */
 /** model.h
  ** Original author: mdeters
  ** Major contributors: none
diff --git a/src/util/options.h b/src/util/options.h
index 82552553f..f3bc52d34 100644
--- a/src/util/options.h
+++ b/src/util/options.h
@@ -1,4 +1,4 @@
-/*********************                                           -*- C++ -*-  */
+/*********************                                                        */
 /** options.h
  ** Original author: mdeters
  ** Major contributors: dejan
diff --git a/src/util/output.cpp b/src/util/output.cpp
index fb48a23a5..01a485136 100644
--- a/src/util/output.cpp
+++ b/src/util/output.cpp
@@ -1,4 +1,4 @@
-/*********************                                           -*- C++ -*-  */
+/*********************                                                        */
 /** output.cpp
  ** Original author: mdeters
  ** Major contributors: none
diff --git a/src/util/output.h b/src/util/output.h
index d11725fc5..8ba1ea26b 100644
--- a/src/util/output.h
+++ b/src/util/output.h
@@ -1,4 +1,4 @@
-/*********************                                           -*- C++ -*-  */
+/*********************                                                        */
 /** output.h
  ** Original author: mdeters
  ** Major contributors: none
diff --git a/src/util/result.h b/src/util/result.h
index 8cfac4d09..49ba7c697 100644
--- a/src/util/result.h
+++ b/src/util/result.h
@@ -1,4 +1,4 @@
-/*********************                                           -*- C++ -*-  */
+/*********************                                                        */
 /** result.h
  ** Original author: mdeters
  ** Major contributors: none
diff --git a/src/util/unique_id.h b/src/util/unique_id.h
index 8b5e1f31e..244b8a5dd 100644
--- a/src/util/unique_id.h
+++ b/src/util/unique_id.h
@@ -1,4 +1,4 @@
-/*********************                                           -*- C++ -*-  */
+/*********************                                                        */
 /** unique_id.h
  ** Original author: mdeters
  ** Major contributors: none
diff --git a/test/unit/context/context_black.h b/test/unit/context/context_black.h
index 107feb41c..b80ddf70a 100644
--- a/test/unit/context/context_black.h
+++ b/test/unit/context/context_black.h
@@ -1,8 +1,8 @@
-/*********************                                           -*- C++ -*-  */
+/*********************                                                        */
 /** context_black.h
  ** Original author: dejan
  ** Major contributors: none
- ** Minor contributors (to current version): none
+ ** Minor contributors (to current version): mdeters
  ** This file is part of the CVC4 prototype.
  ** Copyright (c) 2009, 2010  The Analysis of Computer Systems Group (ACSys)
  ** Courant Institute of Mathematical Sciences
diff --git a/test/unit/context/context_mm_black.h b/test/unit/context/context_mm_black.h
index 649915a7f..bda1cb141 100644
--- a/test/unit/context/context_mm_black.h
+++ b/test/unit/context/context_mm_black.h
@@ -1,8 +1,8 @@
-/*********************                                           -*- C++ -*-  */
+/*********************                                                        */
 /** context_mm_black.h
  ** Original author: dejan
  ** Major contributors: none
- ** Minor contributors (to current version): none
+ ** Minor contributors (to current version): mdeters
  ** This file is part of the CVC4 prototype.
  ** Copyright (c) 2009, 2010  The Analysis of Computer Systems Group (ACSys)
  ** Courant Institute of Mathematical Sciences
diff --git a/test/unit/expr/node_black.h b/test/unit/expr/node_black.h
index c7173b4cf..fd2cf3332 100644
--- a/test/unit/expr/node_black.h
+++ b/test/unit/expr/node_black.h
@@ -1,4 +1,4 @@
-/*********************                                           -*- C++ -*-  */
+/*********************                                                        */
 /** node_black.h
  ** Original author: mdeters
  ** Major contributors: taking
diff --git a/test/unit/expr/node_white.h b/test/unit/expr/node_white.h
index f8c950fd3..c097f2758 100644
--- a/test/unit/expr/node_white.h
+++ b/test/unit/expr/node_white.h
@@ -1,4 +1,4 @@
-/*********************                                           -*- C++ -*-  */
+/*********************                                                        */
 /** node_white.h
  ** Original author: mdeters
  ** Major contributors: none
diff --git a/test/unit/parser/parser_black.h b/test/unit/parser/parser_black.h
index 28a38892f..26c572ce6 100644
--- a/test/unit/parser/parser_black.h
+++ b/test/unit/parser/parser_black.h
@@ -1,4 +1,4 @@
-/*********************                                           -*- C++ -*-  */
+/*********************                                                        */
 /** parser_black.h
  ** Original author: cconway
  ** Major contributors: dejan