Skip to content

Fix style#193

Merged
tzanio merged 2 commits intomasterfrom
style-fix
Aug 20, 2021
Merged

Fix style#193
tzanio merged 2 commits intomasterfrom
style-fix

Conversation

@tzanio
Copy link
Copy Markdown
Member

@tzanio tzanio commented Aug 20, 2021

No description provided.

@tzanio tzanio requested a review from publixsubfan August 20, 2021 15:25
@tzanio
Copy link
Copy Markdown
Member Author

tzanio commented Aug 20, 2021

Does this fix look OK @kanye-quest?

@tzanio
Copy link
Copy Markdown
Member Author

tzanio commented Aug 20, 2021

As a reminder we use astyle-2.05.1 with the config/mfem.astylerc from MFEM. Here are the corresponding diffs from tonight's regression testing:

diff --git a/lib/sdl.cpp b/lib/sdl.cpp
index 37fa3f8..4b50dae 100644
--- a/lib/sdl.cpp
+++ b/lib/sdl.cpp
@@ -111,7 +111,7 @@ bool SdlWindow::createWindow(const char* title, int x, int y, int w, int h,
    if (err == GLEW_ERROR_NO_GLX_DISPLAY)
    {
       cerr << "GLEW: No GLX display found. If you are using Wayland this can "
-              "be ignored." << endl;
+           "be ignored." << endl;
       err = GLEW_OK;
    }
 #endif
@@ -443,10 +443,10 @@ void SdlWindow::mainIter()
          events_available.wait(
             event_lock,
             [this]()
-            {
-               // Sleep until events from WM or glvis_command can be handled
-               return !waiting_events.empty() || call_idle_func;
-            });
+         {
+            // Sleep until events from WM or glvis_command can be handled
+            return !waiting_events.empty() || call_idle_func;
+         });
       }
    }
    if (wnd_state == RenderState::ExposePending)



diff --git a/lib/threads.cpp b/lib/threads.cpp
index 870464d..74d2410 100644
--- a/lib/threads.cpp
+++ b/lib/threads.cpp
@@ -24,7 +24,7 @@ GLVisCommand::GLVisCommand(
    vs        = _vs;
    keep_attr = _keep_attr;
    thread_wnd = GetAppWindow(); // should be set in this thread by a call to
-                                // InitVisualization()
+   // InitVisualization()
 
    num_waiting = 0;
    terminating = false;

@tzanio tzanio self-assigned this Aug 20, 2021
@tzanio tzanio added this to the glvis-4.1 milestone Aug 20, 2021
@tzanio tzanio requested a review from pazner August 20, 2021 15:43
@tzanio tzanio mentioned this pull request Aug 20, 2021
15 tasks
@tzanio tzanio merged commit 4ac73c0 into master Aug 20, 2021
@tzanio tzanio deleted the style-fix branch August 20, 2021 18:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants