Skip to content

Commit 4a7833f

Browse files
authored
Update template main.cpp to std::make_shared (#7635)
#changelog #examples
1 parent 39e25cf commit 4a7833f

184 files changed

Lines changed: 207 additions & 207 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

addons/ofxAndroid/src/ofAppAndroidWindow.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,9 +129,9 @@ void ofAppAndroidWindow::setup(const ofxAndroidWindowSettings & settings){
129129
glesVersion = settings.glesVersion;
130130
ofLogError() << "setup gles" << glesVersion;
131131
if(glesVersion<2){
132-
currentRenderer = make_shared<ofGLRenderer>(this);
132+
currentRenderer = std::make_shared<ofGLRenderer>(this);
133133
}else{
134-
currentRenderer = make_shared<ofGLProgrammableRenderer>(this);
134+
currentRenderer = std::make_shared<ofGLProgrammableRenderer>(this);
135135
}
136136

137137
jclass javaClass = ofGetJNIEnv()->FindClass("cc/openframeworks/OFAndroid");

addons/ofxAssimpModelLoader/src/ofxAssimpMeshHelper.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ void ofxAssimpMeshHelper::addTexture(ofxAssimpTexture & aAssimpTex){
2424
meshTextures.push_back(shared_ptr<ofxAssimpTexture>(&assimpTexture,[](ofxAssimpTexture*){}));
2525
}
2626
}else{
27-
auto otherTex = make_shared<ofxAssimpTexture>();
27+
auto otherTex = std::make_shared<ofxAssimpTexture>();
2828
(*otherTex.get()) = aAssimpTex;
2929

3030
meshTextures.push_back(otherTex);

addons/ofxEmscripten/src/ofxAppEmscriptenWindow.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ void ofxAppEmscriptenWindow::setup(const ofGLESWindowSettings & settings){
4747

4848
makeCurrent();
4949

50-
_renderer = make_shared<ofGLProgrammableRenderer>(this);
50+
_renderer = std::make_shared<ofGLProgrammableRenderer>(this);
5151
((ofGLProgrammableRenderer*)_renderer.get())->setup(2,0);
5252

5353
emscripten_set_keydown_callback(EMSCRIPTEN_EVENT_TARGET_WINDOW,this,1,&keydown_cb);

apps/devApps/random explorer/src/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ int main( ){
1010

1111
auto window = ofCreateWindow(settings);
1212

13-
ofRunApp(window, make_shared<ofApp>());
13+
ofRunApp(window, std::make_shared<ofApp>());
1414
ofRunMainLoop();
1515

1616
}

examples/3d/3DPrimitivesExample/src/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ int main(){
1010

1111
auto window = ofCreateWindow(settings);
1212

13-
ofRunApp(window, make_shared<ofApp>());
13+
ofRunApp(window, std::make_shared<ofApp>());
1414
ofRunMainLoop();
1515

1616
}

examples/3d/advanced3dExample/src/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ int main( ){
1111

1212
auto window = ofCreateWindow(settings);
1313

14-
ofRunApp(window, make_shared<ofApp>());
14+
ofRunApp(window, std::make_shared<ofApp>());
1515
ofRunMainLoop();
1616

1717
}

examples/3d/assimp3DModelLoaderExample/src/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ int main( ){
1212

1313
auto window = ofCreateWindow(settings);
1414

15-
ofRunApp(window, make_shared<ofApp>());
15+
ofRunApp(window, std::make_shared<ofApp>());
1616
ofRunMainLoop();
1717

1818
}

examples/3d/cameraLensOffsetExample/src/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ int main() {
99

1010
auto window = ofCreateWindow(settings);
1111

12-
ofRunApp(window, make_shared<ofApp>());
12+
ofRunApp(window, std::make_shared<ofApp>());
1313
ofRunMainLoop();
1414

1515
}

examples/3d/cameraParentingExample/src/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ int main( ){
1111

1212
auto window = ofCreateWindow(settings);
1313

14-
ofRunApp(window, make_shared<ofApp>());
14+
ofRunApp(window, std::make_shared<ofApp>());
1515
ofRunMainLoop();
1616

1717
}

examples/3d/cameraRibbonExample/src/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ int main( ){
1111

1212
auto window = ofCreateWindow(settings);
1313

14-
ofRunApp(window, make_shared<ofApp>());
14+
ofRunApp(window, std::make_shared<ofApp>());
1515
ofRunMainLoop();
1616

1717
}

0 commit comments

Comments
 (0)