shared_ptr as const in function parameter to avoid temporary copies (o…

…penframeworks#6839) #changelog #app
tanaso · May 26, 2022 · eb83025 · eb83025
1 parent 3f4444b
commit eb83025
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/libs/openFrameworks/app/ofMainLoop.cpp b/libs/openFrameworks/app/ofMainLoop.cpp
@@ -70,7 +70,7 @@ shared_ptr<ofAppBaseWindow> ofMainLoop::createWindow(const ofWindowSettings & se
 	return window;
 }
 
-void ofMainLoop::run(shared_ptr<ofAppBaseWindow> window, shared_ptr<ofBaseApp> && app){
+void ofMainLoop::run(const shared_ptr<ofAppBaseWindow> & window, shared_ptr<ofBaseApp> && app){
 	windowsApps[window] = app;
 	if(app){
 		ofAddListener(window->events().setup,app.get(),&ofBaseApp::setup,OF_EVENT_ORDER_APP);
@@ -228,7 +228,7 @@ shared_ptr<ofAppBaseWindow> ofMainLoop::getCurrentWindow(){
 	return currentWindow.lock();
 }
 
-void ofMainLoop::setCurrentWindow(shared_ptr<ofAppBaseWindow> window){
+void ofMainLoop::setCurrentWindow(const shared_ptr<ofAppBaseWindow> & window){
 	currentWindow = window;
 }
 

diff --git a/libs/openFrameworks/app/ofMainLoop.h b/libs/openFrameworks/app/ofMainLoop.h
@@ -15,7 +15,7 @@ class ofMainLoop {
 
 	std::shared_ptr<ofAppBaseWindow> createWindow(const ofWindowSettings & settings);
 	template<typename Window>
-	void addWindow(std::shared_ptr<Window> window){
+	void addWindow(const std::shared_ptr<Window> & window){
 		allowMultiWindow = Window::allowsMultiWindow();
 		if(Window::doesLoop()){
 		    windowLoop = Window::loop;
@@ -31,15 +31,15 @@ class ofMainLoop {
 		ofAddListener(window->events().keyPressed,this,&ofMainLoop::keyPressed);
 	}
 
-	void run(std::shared_ptr<ofAppBaseWindow> window, std::shared_ptr<ofBaseApp> && app);
+	void run(const std::shared_ptr<ofAppBaseWindow> & window, std::shared_ptr<ofBaseApp> && app);
 	void run(std::shared_ptr<ofBaseApp> && app);
 	int loop();
 	void loopOnce();
 	void pollEvents();
 	void exit();
 	void shouldClose(int status);
 	std::shared_ptr<ofAppBaseWindow> getCurrentWindow();
-	void setCurrentWindow(std::shared_ptr<ofAppBaseWindow> window);
+	void setCurrentWindow(const std::shared_ptr<ofAppBaseWindow> & window);
 	void setCurrentWindow(ofAppBaseWindow * window);
 	std::shared_ptr<ofBaseApp> getCurrentApp();
 	void setEscapeQuitsLoop(bool quits);