More std::endl removal

KevinJW · KevinJW · commit 040eed5d1360 · 2026-01-16T18:06:31.000Z
Signed-off-by: Kevin Wheatley &lt;kevin.wheatley@framestore.com&gt;
diff --git a/src/apps/ociolutimage/main.cpp b/src/apps/ociolutimage/main.cpp
@@ -166,7 +166,7 @@ int main(int argc, const char* argv[])
 
     if (ap.parse(argc, argv) < 0)
     {
-        std::cout << ap.geterror() << std::endl;
+        std::cout << ap.geterror() << "\n";
         ap.usage();
         std::cout << "\n";
         return 1;
@@ -192,7 +192,7 @@ int main(int argc, const char* argv[])
         }
         catch (const std::exception & e)
         {
-            std::cerr << "Error generating image: " << e.what() << std::endl;
+            std::cerr << "Error generating image: " << e.what() << "\n";
             exit(1);
         }
         catch (...)
@@ -212,7 +212,7 @@ int main(int argc, const char* argv[])
         }
         catch (const std::exception & e)
         {
-            std::cerr << "Error extracting LUT: " << e.what() << std::endl;
+            std::cerr << "Error extracting LUT: " << e.what() << "\n";
             exit(1);
         }
         catch (...)
diff --git a/src/apps/ociomakeclf/main.cpp b/src/apps/ociomakeclf/main.cpp
@@ -75,8 +75,7 @@ void CreateOutputLutFile(const std::string & outLutFilepath, OCIO::ConstGroupTra
         std::ostringstream oss;
         oss << "Could not open the file '"
             << outLutFilepath
-            << "'."
-            << std::endl;
+            << "'.\n";
         throw OCIO::Exception(oss.str().c_str());
     }
 }
@@ -104,7 +103,7 @@ int main(int argc, const char ** argv)
 
     if (ap.parse(argc, argv) < 0)
     {
-        std::cerr << std::endl << ap.geterror() << std::endl << std::endl;
+        std::cerr << "\n" << ap.geterror() << "\n\n";
         ap.usage();
         return 1;
     }
@@ -130,17 +129,17 @@ int main(int argc, const char ** argv)
             if (StringUtils::EndsWith(cscName, BuiltinSuffix))
             {
                 cscName.resize(cscName.size() - strlen(BuiltinSuffix));
-                std::cout << std::endl << "\t" << cscName;
+                std::cout << "\n\t" << cscName;
             }
         }
-        std::cout << std::endl << std::endl;
+        std::cout << "\n\n";
 
         return 0;
     }
 
     if (args.size() != 2)
     {
-        std::cerr << "ERROR: Expecting 2 arguments, found " << args.size() << "." << std::endl;
+        std::cerr << "ERROR: Expecting 2 arguments, found " << args.size() << ".\n";
         ap.usage();
         return 1;
     }
@@ -172,15 +171,14 @@ int main(int argc, const char ** argv)
         {
             std::cerr << "ERROR: The LUT color space name '"
                       << originalCSC
-                      << "' is not supported."
-                      << std::endl;
+                      << "' is not supported.\n";
             return 1;
         }
     }
 
     if (outLutFilepath.empty())
     {
-        std::cerr << "ERROR: The output file path is missing." << std::endl;
+        std::cerr << "ERROR: The output file path is missing.\n";
         return 1;
     }
     else
@@ -190,22 +188,21 @@ int main(int argc, const char ** argv)
         {
             std::cerr << "ERROR: The output LUT file path '"
                       << outLutFilepath
-                      << "' must have a .clf extension."
-                      << std::endl;
+                      << "' must have a .clf extension.\n";
             return 1;
         }
     }
 
     if (verbose)
     {
-        std::cout << "OCIO Version: " << OCIO::GetVersion() << std::endl;
+        std::cout << "OCIO Version: " << OCIO::GetVersion() << "\n";
     }
 
     try
     {
         if (verbose)
         {
-            std::cout << "Building the transformation." << std::endl;
+            std::cout << "Building the transformation.\n";
         }
 
         OCIO::GroupTransformRcPtr grp = OCIO::GroupTransform::Create();
@@ -261,7 +258,7 @@ int main(int argc, const char ** argv)
 
         if (verbose && !measure)
         {
-            std::cout << Msg << "." << std::endl;
+            std::cout << Msg << ".\n";
         }
 
         if (measure)
@@ -280,17 +277,17 @@ int main(int argc, const char ** argv)
     }
     catch (OCIO::Exception & ex)
     {
-        std::cerr << "OCIO ERROR: " << ex.what() << std::endl;
+        std::cerr << "OCIO ERROR: " << ex.what() << "\n";
         return 1;
     }
     catch (std::exception & ex)
     {
-        std::cerr << "ERROR:  " << ex.what() << std::endl;
+        std::cerr << "ERROR:  " << ex.what() << "\n";
         return 1;
     }
     catch (...)
     {
-        std::cerr << "ERROR: Unknown error encountered." << std::endl;
+        std::cerr << "ERROR: Unknown error encountered.\n";
         return 1;
     }
 
diff --git a/src/apps/ociomergeconfigs/main.cpp b/src/apps/ociomergeconfigs/main.cpp
@@ -107,13 +107,13 @@ int main(int argc, const char **argv)
 
     if (ap.parse(argc, argv) < 0)
     {
-        std::cerr << ap.geterror() << std::endl;
+        std::cerr << ap.geterror() << "\n";
         ap.usage();
         exit(1);
     }
     else if (args.size() != 1)
     {
-        std::cerr << "ERROR: Expecting 1 arguments, found " << args.size() << "." << std::endl;
+        std::cerr << "ERROR: Expecting 1 arguments, found " << args.size() << ".\n";
         ap.usage();
         exit(1);
     }
@@ -134,7 +134,7 @@ int main(int argc, const char **argv)
     } 
     catch (OCIO::Exception & e)
     {
-        std::cout << e.what() << std::endl;
+        std::cout << e.what() << "\n";
         exit(1);
     }
 
@@ -150,44 +150,43 @@ int main(int argc, const char **argv)
             }
             catch (OCIO::Exception & exception)
             {
-                std::cout << exception.what() << std::endl;
+                std::cout << exception.what() << "\n";
                 exit(1);
             }
         }
 
         if (displayParams)
         {
-            std::cout << "********************" << std::endl;
-            std::cout << "Merger options" << std::endl;
-            std::cout << "********************" << std::endl;
+            std::cout << "********************\n"
+                         "Merger options\n"
+                         "********************\n";
             std::ostringstream os;
             newMerger->serialize(os);
-            std::cout << os.str() << std::endl;
-            std::cout << std::endl;
+            std::cout << os.str() << "\n\n";
         }
 
         // "Show-all" option take priority over the "show" option.
         if (displayAllConfig)
         {
             for (int i = 0; i < merger->getNumConfigMergingParameters(); i++)
             {
-                std::cout << "*********************" << std::endl;
-                std::cout << "Merged Config " << i << std::endl;
-                std::cout << "*********************" << std::endl;
+                std::cout << "*********************\n"
+                             "Merged Config " << i << "\n"
+                             "*********************\n";
                 std::ostringstream os;
                 newMerger->getMergedConfig(i)->serialize(os);
-                std::cout << os.str() << std::endl;
+                std::cout << os.str() << "\n";
             }
         }
 
         if (displayConfig && !displayAllConfig)
         {
-            std::cout << "********************" << std::endl;
-            std::cout << "Last Merged Config" << std::endl;
-            std::cout << "********************" << std::endl;
+            std::cout << "********************\n"
+                         "Last Merged Config\n"
+                         "********************\n";
             std::ostringstream os;
             newMerger->getMergedConfig()->serialize(os);
-            std::cout << os.str() << std::endl;
+            std::cout << os.str() << "\n";
         }
 
         if (!outputFile.empty())

Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,7 @@ int main(int argc, const char* argv[])`
`166`	`166`
`167`	`167`	`if (ap.parse(argc, argv) < 0)`
`168`	`168`	`{`
`169`		`- std::cout << ap.geterror() << std::endl;`
	`169`	`+ std::cout << ap.geterror() << "\n";`
`170`	`170`	`ap.usage();`
`171`	`171`	`std::cout << "\n";`
`172`	`172`	`return 1;`
`@@ -192,7 +192,7 @@ int main(int argc, const char* argv[])`
`192`	`192`	`}`
`193`	`193`	`catch (const std::exception & e)`
`194`	`194`	`{`
`195`		`- std::cerr << "Error generating image: " << e.what() << std::endl;`
	`195`	`+ std::cerr << "Error generating image: " << e.what() << "\n";`
`196`	`196`	`exit(1);`
`197`	`197`	`}`
`198`	`198`	`catch (...)`
`@@ -212,7 +212,7 @@ int main(int argc, const char* argv[])`
`212`	`212`	`}`
`213`	`213`	`catch (const std::exception & e)`
`214`	`214`	`{`
`215`		`- std::cerr << "Error extracting LUT: " << e.what() << std::endl;`
	`215`	`+ std::cerr << "Error extracting LUT: " << e.what() << "\n";`
`216`	`216`	`exit(1);`
`217`	`217`	`}`
`218`	`218`	`catch (...)`
Original file line number	Diff line number	Diff line change
`@@ -75,8 +75,7 @@ void CreateOutputLutFile(const std::string & outLutFilepath, OCIO::ConstGroupTra`
`75`	`75`	`std::ostringstream oss;`
`76`	`76`	`oss << "Could not open the file '"`
`77`	`77`	`<< outLutFilepath`
`78`		`- << "'."`
`79`		`- << std::endl;`
	`78`	`+ << "'.\n";`
`80`	`79`	`throw OCIO::Exception(oss.str().c_str());`
`81`	`80`	`}`
`82`	`81`	`}`
`@@ -104,7 +103,7 @@ int main(int argc, const char ** argv)`
`104`	`103`
`105`	`104`	`if (ap.parse(argc, argv) < 0)`
`106`	`105`	`{`
`107`		`- std::cerr << std::endl << ap.geterror() << std::endl << std::endl;`
	`106`	`+ std::cerr << "\n" << ap.geterror() << "\n\n";`
`108`	`107`	`ap.usage();`
`109`	`108`	`return 1;`
`110`	`109`	`}`
`@@ -130,17 +129,17 @@ int main(int argc, const char ** argv)`
`130`	`129`	`if (StringUtils::EndsWith(cscName, BuiltinSuffix))`
`131`	`130`	`{`
`132`	`131`	`cscName.resize(cscName.size() - strlen(BuiltinSuffix));`
`133`		`- std::cout << std::endl << "\t" << cscName;`
	`132`	`+ std::cout << "\n\t" << cscName;`
`134`	`133`	`}`
`135`	`134`	`}`
`136`		`- std::cout << std::endl << std::endl;`
	`135`	`+ std::cout << "\n\n";`
`137`	`136`
`138`	`137`	`return 0;`
`139`	`138`	`}`
`140`	`139`
`141`	`140`	`if (args.size() != 2)`
`142`	`141`	`{`
`143`		`- std::cerr << "ERROR: Expecting 2 arguments, found " << args.size() << "." << std::endl;`
	`142`	`+ std::cerr << "ERROR: Expecting 2 arguments, found " << args.size() << ".\n";`
`144`	`143`	`ap.usage();`
`145`	`144`	`return 1;`
`146`	`145`	`}`
`@@ -172,15 +171,14 @@ int main(int argc, const char ** argv)`
`172`	`171`	`{`
`173`	`172`	`std::cerr << "ERROR: The LUT color space name '"`
`174`	`173`	`<< originalCSC`
`175`		`- << "' is not supported."`
`176`		`- << std::endl;`
	`174`	`+ << "' is not supported.\n";`
`177`	`175`	`return 1;`
`178`	`176`	`}`
`179`	`177`	`}`
`180`	`178`
`181`	`179`	`if (outLutFilepath.empty())`
`182`	`180`	`{`
`183`		`- std::cerr << "ERROR: The output file path is missing." << std::endl;`
	`181`	`+ std::cerr << "ERROR: The output file path is missing.\n";`
`184`	`182`	`return 1;`
`185`	`183`	`}`
`186`	`184`	`else`
`@@ -190,22 +188,21 @@ int main(int argc, const char ** argv)`
`190`	`188`	`{`
`191`	`189`	`std::cerr << "ERROR: The output LUT file path '"`
`192`	`190`	`<< outLutFilepath`
`193`		`- << "' must have a .clf extension."`
`194`		`- << std::endl;`
	`191`	`+ << "' must have a .clf extension.\n";`
`195`	`192`	`return 1;`
`196`	`193`	`}`
`197`	`194`	`}`
`198`	`195`
`199`	`196`	`if (verbose)`
`200`	`197`	`{`
`201`		`- std::cout << "OCIO Version: " << OCIO::GetVersion() << std::endl;`
	`198`	`+ std::cout << "OCIO Version: " << OCIO::GetVersion() << "\n";`
`202`	`199`	`}`
`203`	`200`
`204`	`201`	`try`
`205`	`202`	`{`
`206`	`203`	`if (verbose)`
`207`	`204`	`{`
`208`		`- std::cout << "Building the transformation." << std::endl;`
	`205`	`+ std::cout << "Building the transformation.\n";`
`209`	`206`	`}`
`210`	`207`
`211`	`208`	`OCIO::GroupTransformRcPtr grp = OCIO::GroupTransform::Create();`
`@@ -261,7 +258,7 @@ int main(int argc, const char ** argv)`
`261`	`258`
`262`	`259`	`if (verbose && !measure)`
`263`	`260`	`{`
`264`		`- std::cout << Msg << "." << std::endl;`
	`261`	`+ std::cout << Msg << ".\n";`
`265`	`262`	`}`
`266`	`263`
`267`	`264`	`if (measure)`
`@@ -280,17 +277,17 @@ int main(int argc, const char ** argv)`
`280`	`277`	`}`
`281`	`278`	`catch (OCIO::Exception & ex)`
`282`	`279`	`{`
`283`		`- std::cerr << "OCIO ERROR: " << ex.what() << std::endl;`
	`280`	`+ std::cerr << "OCIO ERROR: " << ex.what() << "\n";`
`284`	`281`	`return 1;`
`285`	`282`	`}`
`286`	`283`	`catch (std::exception & ex)`
`287`	`284`	`{`
`288`		`- std::cerr << "ERROR: " << ex.what() << std::endl;`
	`285`	`+ std::cerr << "ERROR: " << ex.what() << "\n";`
`289`	`286`	`return 1;`
`290`	`287`	`}`
`291`	`288`	`catch (...)`
`292`	`289`	`{`
`293`		`- std::cerr << "ERROR: Unknown error encountered." << std::endl;`
	`290`	`+ std::cerr << "ERROR: Unknown error encountered.\n";`
`294`	`291`	`return 1;`
`295`	`292`	`}`
`296`	`293`
Original file line number	Diff line number	Diff line change
`@@ -107,13 +107,13 @@ int main(int argc, const char **argv)`
`107`	`107`
`108`	`108`	`if (ap.parse(argc, argv) < 0)`
`109`	`109`	`{`
`110`		`- std::cerr << ap.geterror() << std::endl;`
	`110`	`+ std::cerr << ap.geterror() << "\n";`
`111`	`111`	`ap.usage();`
`112`	`112`	`exit(1);`
`113`	`113`	`}`
`114`	`114`	`else if (args.size() != 1)`
`115`	`115`	`{`
`116`		`- std::cerr << "ERROR: Expecting 1 arguments, found " << args.size() << "." << std::endl;`
	`116`	`+ std::cerr << "ERROR: Expecting 1 arguments, found " << args.size() << ".\n";`
`117`	`117`	`ap.usage();`
`118`	`118`	`exit(1);`
`119`	`119`	`}`
`@@ -134,7 +134,7 @@ int main(int argc, const char **argv)`
`134`	`134`	`}`
`135`	`135`	`catch (OCIO::Exception & e)`
`136`	`136`	`{`
`137`		`- std::cout << e.what() << std::endl;`
	`137`	`+ std::cout << e.what() << "\n";`
`138`	`138`	`exit(1);`
`139`	`139`	`}`
`140`	`140`
`@@ -150,44 +150,43 @@ int main(int argc, const char **argv)`
`150`	`150`	`}`
`151`	`151`	`catch (OCIO::Exception & exception)`
`152`	`152`	`{`
`153`		`- std::cout << exception.what() << std::endl;`
	`153`	`+ std::cout << exception.what() << "\n";`
`154`	`154`	`exit(1);`
`155`	`155`	`}`
`156`	`156`	`}`
`157`	`157`
`158`	`158`	`if (displayParams)`
`159`	`159`	`{`
`160`		`- std::cout << "********************" << std::endl;`
`161`		`- std::cout << "Merger options" << std::endl;`
`162`		`- std::cout << "********************" << std::endl;`
	`160`	`+ std::cout << "********************\n"`
	`161`	`+ "Merger options\n"`
	`162`	`+ "********************\n";`
`163`	`163`	`std::ostringstream os;`
`164`	`164`	`newMerger->serialize(os);`
`165`		`- std::cout << os.str() << std::endl;`
`166`		`- std::cout << std::endl;`
	`165`	`+ std::cout << os.str() << "\n\n";`
`167`	`166`	`}`
`168`	`167`
`169`	`168`	`// "Show-all" option take priority over the "show" option.`
`170`	`169`	`if (displayAllConfig)`
`171`	`170`	`{`
`172`	`171`	`for (int i = 0; i < merger->getNumConfigMergingParameters(); i++)`
`173`	`172`	`{`
`174`		`- std::cout << "*********************" << std::endl;`
`175`		`- std::cout << "Merged Config " << i << std::endl;`
`176`		`- std::cout << "*********************" << std::endl;`
	`173`	`+ std::cout << "*********************\n"`
	`174`	`+ "Merged Config " << i << "\n"`
	`175`	`+ "*********************\n";`
`177`	`176`	`std::ostringstream os;`
`178`	`177`	`newMerger->getMergedConfig(i)->serialize(os);`
`179`		`- std::cout << os.str() << std::endl;`
	`178`	`+ std::cout << os.str() << "\n";`
`180`	`179`	`}`
`181`	`180`	`}`
`182`	`181`
`183`	`182`	`if (displayConfig && !displayAllConfig)`
`184`	`183`	`{`
`185`		`- std::cout << "********************" << std::endl;`
`186`		`- std::cout << "Last Merged Config" << std::endl;`
`187`		`- std::cout << "********************" << std::endl;`
	`184`	`+ std::cout << "********************\n"`
	`185`	`+ "Last Merged Config\n"`
	`186`	`+ "********************\n";`
`188`	`187`	`std::ostringstream os;`
`189`	`188`	`newMerger->getMergedConfig()->serialize(os);`
`190`		`- std::cout << os.str() << std::endl;`
	`189`	`+ std::cout << os.str() << "\n";`
`191`	`190`	`}`
`192`	`191`
`193`	`192`	`if (!outputFile.empty())`