language bindings fixes for yesterday's portfolio merge

diff --git a/src/expr/expr.i b/src/expr/expr.i
index ff4d219a2b7261005b36a044cd2314258f518821..6ed7f2d25023aeca6327bb90a254cba5deb3e8d9 100644 (file)
--- a/src/expr/expr.i
+++ b/src/expr/expr.i
@@ -22,4 +22,10 @@
 %rename(getChild) CVC4::Expr::operator[](unsigned i) const;
 %ignore CVC4::Expr::operator bool() const;// can just use isNull()
 
+namespace CVC4 {
+  namespace expr {
+    %ignore exportInternal;
+  }/* CVC4::expr namespace */
+}/* CVC4 namespace */
+
 %include "expr/expr.h"

diff --git a/src/expr/expr_manager_template.cpp b/src/expr/expr_manager_template.cpp
index 83a80ed137e3ddcc8dd2427ca0378131af3650b5..46a7bb82ce248e5a85de47fd60ceef7ca8096f3a 100644 (file)
--- a/src/expr/expr_manager_template.cpp
+++ b/src/expr/expr_manager_template.cpp
@@ -11,7 +11,7 @@
  ** See the file COPYING in the top-level source directory for licensing
  ** information.\endverbatim
  **
- ** \brief Public-facing expression manager interface, implementation.
+ ** \brief Public-facing expression manager interface, implementation
  **
  ** Public-facing expression manager interface, implementation.
  **/

diff --git a/src/expr/expr_manager_template.h b/src/expr/expr_manager_template.h
index eecb40f3ec6cf690a37b3b7a4c36e73a89ea760d..2abd0582167e10bad1bcc21bb10bb7f5beffe4fe 100644 (file)
--- a/src/expr/expr_manager_template.h
+++ b/src/expr/expr_manager_template.h
@@ -11,7 +11,7 @@
  ** See the file COPYING in the top-level source directory for licensing
  ** information.\endverbatim
  **
- ** \brief Public-facing expression manager interface.
+ ** \brief Public-facing expression manager interface
  **
  ** Public-facing expression manager interface.
  **/

diff --git a/src/expr/type.i b/src/expr/type.i
index acde96955632bc708b0ed4fdcec1fca6e05e1d05..13ae9663e1611a80af6286bcc134bb8da332a8ad 100644 (file)
--- a/src/expr/type.i
+++ b/src/expr/type.i
@@ -31,4 +31,10 @@
 %rename(toSortConstructorType) CVC4::Type::operator SortConstructorType() const;
 %rename(toKindType) CVC4::Type::operator KindType() const;
 
+namespace CVC4 {
+  namespace expr {
+    %ignore exportTypeInternal;
+  }/* CVC4::expr namespace */
+}/* CVC4 namespace */
+
 %include "expr/type.h"

diff --git a/src/expr/variable_type_map.h b/src/expr/variable_type_map.h
index a34bec846a13cf8501c59df242de504248adea21..8f3f4a27b14198e15bd90b5d30efe31f71d557d6 100644 (file)
--- a/src/expr/variable_type_map.h
+++ b/src/expr/variable_type_map.h
@@ -57,7 +57,7 @@ struct CVC4_PUBLIC ExprManagerMapCollection {
   VariableTypeMap d_typeMap;
   VarMap d_to;
   VarMap d_from;
-};
+};/* struct ExprManagerMapCollection */
 
 }/* CVC4 namespace */