Skip to content

Commit 6972d5a

Browse files
janherlingmeta-codesync[bot]
authored andcommitted
Added missing include files
Summary: Further, minor code adjustments. Reviewed By: enpe Differential Revision: D86107498 Privacy Context Container: L1192943 fbshipit-source-id: f2d570c9e02ab49ca1d8b9b47a8714c67ec1b436
1 parent e72dcb7 commit 6972d5a

File tree

10 files changed

+24
-22
lines changed

10 files changed

+24
-22
lines changed

impl/application/ocean/demo/math/discretecosinetransform/win/DiscreteCosineTransform.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ int __stdcall wWinMain(HINSTANCE hInstance, HINSTANCE /*hPrevInstance*/, LPTSTR
4545
mainWindow.initialize();
4646
mainWindow.start();
4747
}
48-
catch(const Exception& e)
48+
catch (const Exception& exception)
4949
{
50-
Log::error() << "Unhandled exception: " << e.what();
50+
Log::error() << "Unhandled exception: " << exception.what();
5151
}
5252

5353
#ifdef OCEAN_RUNTIME_STATIC

impl/application/ocean/demo/math/lookup/win/Lookup.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
#include "application/ocean/demo/math/lookup/win/LookupMainWindow.h"
1010

1111
#include "ocean/base/Build.h"
12+
#include "ocean/base/Exception.h"
1213
#include "ocean/base/PluginManager.h"
1314

1415
#include "ocean/platform/win/System.h"
@@ -27,9 +28,9 @@ int __stdcall wWinMain(HINSTANCE hInstance, HINSTANCE /*hPrevInstance*/, LPTSTR
2728
mainWindow.initialize();
2829
mainWindow.start();
2930
}
30-
catch(const Exception& e)
31+
catch (const Exception& exception)
3132
{
32-
Log::error() << "Unhandled exception: " << e.what();
33+
Log::error() << "Unhandled exception: " << exception.what();
3334
}
3435

3536
return 0;

impl/application/ocean/demo/media/imageconverter/win/ImageConverter.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ int __stdcall wWinMain(HINSTANCE hInstance, HINSTANCE /*hPrevInstance*/, LPTSTR
5454
mainWindow.initialize();
5555
mainWindow.start();
5656
}
57-
catch(const Exception& e)
57+
catch (const Exception& exception)
5858
{
59-
Log::error() << "Unhandled exception: " << e.what();
59+
Log::error() << "Unhandled exception: " << exception.what();
6060
}
6161

6262
#ifdef OCEAN_RUNTIME_STATIC

impl/application/ocean/demo/media/movierecorder/win/MovieRecorder.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
#include "application/ocean/demo/media/movierecorder/win/MovieRecorderMainWindow.h"
1010

1111
#include "ocean/base/Build.h"
12+
#include "ocean/base/Exception.h"
1213
#include "ocean/base/PluginManager.h"
1314

1415
#include "ocean/platform/System.h"
@@ -55,9 +56,9 @@ int __stdcall wWinMain(HINSTANCE hInstance, HINSTANCE /*hPrevInstance*/, LPTSTR
5556
mainWindow.initialize();
5657
mainWindow.start();
5758
}
58-
catch(const Exception& e)
59+
catch (const Exception& exception)
5960
{
60-
Log::error() << "Unhandled exception: " << e.what();
61+
Log::error() << "Unhandled exception: " << exception.what();
6162
}
6263

6364
#ifdef OCEAN_RUNTIME_STATIC

impl/application/ocean/shark/android/GLMainView.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ bool GLMainView::loadScene(const std::string& filename, const bool replace)
148148
return false;
149149
}
150150
}
151-
catch(const Exception& exception)
151+
catch (const Exception& exception)
152152
{
153153
Log::error() << exception.what();
154154
return false;
@@ -258,7 +258,7 @@ bool GLMainView::render()
258258

259259
return true;
260260
}
261-
catch(const Exception& exception)
261+
catch (const Exception& exception)
262262
{
263263
Log::error() << exception.what();
264264
}

impl/ocean/interaction/javascript/JSSceneDescriptionNode.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@ void JSBase::function<SceneDescription::NodeRef, JSSceneDescriptionNode::FI_FIEL
349349
}
350350
}
351351
}
352-
catch(const Exception& exception)
352+
catch (const Exception& exception)
353353
{
354354
Log::error() << "SceneDescriptionNode::setField() failed: " << exception.what();
355355
}
@@ -817,7 +817,7 @@ void JSBase::function<SceneDescription::NodeRef, JSSceneDescriptionNode::FI_SET_
817817
Log::warning() << "Unsupported field type of a SceneDescription node.";
818818
}
819819
}
820-
catch(const Exception& exception)
820+
catch (const Exception& exception)
821821
{
822822
Log::error() << "SceneDescriptionNode::setField() failed: " << exception.what();
823823
}

impl/ocean/io/FileConfig.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -660,7 +660,7 @@ bool FileConfig::read()
660660
values_.clear();
661661
return readSubValues(values_, configScanner, false);
662662
}
663-
catch(const Exception& exception)
663+
catch (const Exception& exception)
664664
{
665665
Log::error() << "Failed to load config file: \"" << filename_ << "\" :" << exception.what();
666666
}

impl/ocean/scenedescription/sdx/x3d/ClassicParser.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ NodeRef ClassicParser::parseNode()
260260
throw OceanException(std::string("The node \"") + nodeType + std::string("\" does not have a field \"") + token.raw() + std::string("\"."));
261261
}
262262
}
263-
catch(const Exception& exception)
263+
catch (const Exception& exception)
264264
{
265265
Log::error() << "Error in \"" << scanner_.filename() << "\", line " << scanner_.line() << ", column " << scanner_.column() << ": " << exception.what();
266266

@@ -1512,7 +1512,7 @@ void ClassicParser::parseRoute()
15121512

15131513
startNode->addConnection(startFieldName, targetNode->id(), targetFieldName);
15141514
}
1515-
catch(const Exception& exception)
1515+
catch (const Exception& exception)
15161516
{
15171517
Log::warning() << "Failed to establish the ROUTE in line " << scanner_.line() << ": " << exception.what();
15181518
}

impl/ocean/scenedescription/sdx/x3d/IndexedFaceSet.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,7 @@ void IndexedFaceSet::apply()
431431
++numberPolygons;
432432
}
433433
}
434-
catch(const Exception& exception)
434+
catch (const Exception& exception)
435435
{
436436
Log::error() << exception.what();
437437
renderingObject_.release();
@@ -481,7 +481,7 @@ void IndexedFaceSet::apply()
481481
renderingVertexSet_->setPhantomTextureCoordinateSystem(texCoord_.value()->field<SingleString>("reference").value());
482482
}
483483
}
484-
catch(const Exception& exception)
484+
catch (const Exception& exception)
485485
{
486486
Log::warning() << exception.what();
487487
}

impl/ocean/scenedescription/sdx/x3d/XMLParser.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ NodeRef XMLParser::parseNode(const tinyxml2::XMLElement* xmlNode)
246246
node->setName(name_);
247247
}
248248
}
249-
catch(const Exception& exception)
249+
catch (const Exception& exception)
250250
{
251251
if (name_.empty())
252252
{
@@ -275,7 +275,7 @@ NodeRef XMLParser::parseNode(const tinyxml2::XMLElement* xmlNode)
275275
{
276276
addDynamicField(node, xmlChild);
277277
}
278-
catch(const Exception& exception)
278+
catch (const Exception& exception)
279279
{
280280
if (name_.empty())
281281
{
@@ -293,7 +293,7 @@ NodeRef XMLParser::parseNode(const tinyxml2::XMLElement* xmlNode)
293293
{
294294
parseNodeField(node, xmlChild);
295295
}
296-
catch(const Exception& exception)
296+
catch (const Exception& exception)
297297
{
298298
Log::warning() << exception.what();
299299
}
@@ -302,7 +302,7 @@ NodeRef XMLParser::parseNode(const tinyxml2::XMLElement* xmlNode)
302302
xmlChild = xmlChild->NextSiblingElement();
303303
}
304304
}
305-
catch(const Exception& exception)
305+
catch (const Exception& exception)
306306
{
307307
if (name_.empty())
308308
{
@@ -428,7 +428,7 @@ void XMLParser::parseRoute(const tinyxml2::XMLElement* xmlNode)
428428

429429
startNode->addConnection(startFieldName, targetNode->id(), targetFieldName);
430430
}
431-
catch(const Exception& exception)
431+
catch (const Exception& exception)
432432
{
433433
Log::warning() << "Failed to establish a ROUTE: " << exception.what();
434434
}

0 commit comments

Comments
 (0)