Merge remote-tracking branch 'upstream/master'

1 files changed, 3 insertions, 4 deletions

diff --git a/tests/cgaltest.cc b/tests/cgaltest.cc
index 0cbd89a..0b433bf 100644
--- a/tests/cgaltest.cc
+++ b/tests/cgaltest.cc
@@ -84,8 +84,7 @@ int main(int argc, char **argv)
 
 	const char *filename = argv[1];
 
-	initialize_builtin_functions();
-	initialize_builtin_modules();
+	Builtins::instance()->initialize();
 
 	QApplication app(argc, argv, false);
 	QDir original_path = QDir::current();
@@ -142,8 +141,8 @@ int main(int argc, char **argv)
 	if (!N.empty()) {
 		export_stl(&N, std::cout, NULL);
 	}
-	destroy_builtin_functions();
-	destroy_builtin_modules();
+
+	Builtins::instance(true);
 
 	return 0;
 }