Avoid template bug on macOS

Author: kpeeters

core/pythoncdb/py_algorithms.cc

@@ -71,28 +71,28 @@ namespace cadabra
 			.value("error", Algorithm::result_t::l_error)
 			.export_values();
 
-		def_algo<canonicalise>(m, "canonicalise");
-		def_algo<collect_components>(m, "collect_components");
-		def_algo<collect_factors>(m, "collect_factors");
-		def_algo<collect_terms>(m, "collect_terms");
-		def_algo<combine>(m, "combine");
-		def_algo<decompose_product>(m, "decompose_product");
-		def_algo<distribute>(m, "distribute");
-		def_algo<eliminate_kronecker>(m, "eliminate_kronecker");
-		def_algo<expand>(m, "expand");
-		def_algo<expand_delta>(m, "expand_delta");
-		def_algo<expand_diracbar>(m, "expand_diracbar");
-		def_algo<expand_power>(m, "expand_power");
-		def_algo<flatten_sum>(m, "flatten_sum");
-		def_algo<indexsort>(m, "indexsort");
-		def_algo<lr_tensor>(m, "lr_tensor");
-		def_algo<product_rule>(m, "product_rule");
-		def_algo<reduce_delta>(m, "reduce_delta");
-		def_algo<sort_product>(m, "sort_product");
-		def_algo<sort_spinors>(m, "sort_spinors");
-		def_algo<sort_sum>(m, "sort_sum");
-		def_algo<tabdimension>(m, "tab_dimension");
-		def_algo<young_project_product>(m, "young_project_product");
+		def_algo<canonicalise>(m, "canonicalise", true, false, 0);
+		def_algo<collect_components>(m, "collect_components", true, false, 0);
+		def_algo<collect_factors>(m, "collect_factors", true, false, 0);
+		def_algo<collect_terms>(m, "collect_terms", true, false, 0);
+		def_algo<combine>(m, "combine", true, false, 0);
+		def_algo<decompose_product>(m, "decompose_product", true, false, 0);
+		def_algo<distribute>(m, "distribute", true, false, 0);
+		def_algo<eliminate_kronecker>(m, "eliminate_kronecker", true, false, 0);
+		def_algo<expand>(m, "expand", true, false, 0);
+		def_algo<expand_delta>(m, "expand_delta", true, false, 0);
+		def_algo<expand_diracbar>(m, "expand_diracbar", true, false, 0);
+		def_algo<expand_power>(m, "expand_power", true, false, 0);
+		def_algo<flatten_sum>(m, "flatten_sum", true, false, 0);
+		def_algo<indexsort>(m, "indexsort", true, false, 0);
+		def_algo<lr_tensor>(m, "lr_tensor", true, false, 0);
+		def_algo<product_rule>(m, "product_rule", true, false, 0);
+		def_algo<reduce_delta>(m, "reduce_delta", true, false, 0);
+		def_algo<sort_product>(m, "sort_product", true, false, 0);
+		def_algo<sort_spinors>(m, "sort_spinors", true, false, 0);
+		def_algo<sort_sum>(m, "sort_sum", true, false, 0);
+		def_algo<tabdimension>(m, "tab_dimension", true, false, 0);
+		def_algo<young_project_product>(m, "young_project_product", true, false, 0);
 		def_algo<complete, Ex>(m, "complete", false, false, 0, py::arg("add"));
 		def_algo<decompose, Ex>(m, "decompose", false, false, 0, py::arg("basis"));
 		def_algo<drop_weight, Ex>(m, "drop_weight", false, false, 0, py::arg("condition"));
@@ -120,7 +120,7 @@ namespace cadabra
 		def_algo<take_match, Ex>(m, "take_match", true, false, 0, py::arg("rules"));
 		def_algo<replace_match>(m, "replace_match", false, false, 0);
 		def_algo<zoom, Ex>(m, "zoom", true, false, 0, py::arg("rules"));
-		def_algo<unzoom>(m, "unzoom");
+		def_algo<unzoom>(m, "unzoom", true, false, 0);
 		def_algo<rewrite_indices, Ex, Ex>(m, "rewrite_indices", true, false, 0, py::arg("preferred"), py::arg("converters"));
 		def_algo_preorder<vary, Ex>(m, "vary", false, false, 0, py::arg("rules"));
 		def_algo<split_gamma, bool>(m, "split_gamma", true, false, 0, py::arg("on_back"));

core/pythoncdb/py_algorithms.hh

@@ -25,7 +25,7 @@ namespace cadabra
 		}
 
 	template<class Algo, typename... Args, typename... PyArgs>
-	void def_algo(pybind11::module& m, const char* name, bool deep = true, bool repeat = false, unsigned int depth = 0, PyArgs... args)
+	void def_algo(pybind11::module& m, const char* name, bool deep, bool repeat, unsigned int depth, PyArgs... args)
 		{
 		m.def(name,
 			  &apply_algo<Algo, Args...>,

frontend/gtkmm/ImageView.cc

@@ -33,10 +33,8 @@ bool ImageView::on_motion_notify_event(GdkEventMotion *event)
 	if(sizing) {
 		auto cw = width_at_press  + (event->x - prev_x);
 		auto ratio = pixbuf->get_width() / ((double)pixbuf->get_height());
-		set_size_request( width_at_press  + (event->x - prev_x),
-								height_at_press + (event->y - prev_y) );
-		
 		image.set(pixbuf->scale_simple(cw, cw/ratio, Gdk::INTERP_BILINEAR));
+		set_size_request( cw, cw/ratio );
 		}
 	return true;
 	}