From 7e4355bbfb5ded53c0807b3de58e0f1569b0403e Mon Sep 17 00:00:00 2001 From: jp9000 Date: Tue, 17 Dec 2013 11:29:46 -0700 Subject: [PATCH] this is probably C-style but I prefer it over vague anonymous namespaces, don't kill me please --- obs/settings-basic-video.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/obs/settings-basic-video.cpp b/obs/settings-basic-video.cpp index 0891787e6..9a760b928 100644 --- a/obs/settings-basic-video.cpp +++ b/obs/settings-basic-video.cpp @@ -128,12 +128,9 @@ void BasicVideoData::LoadOther() window->rendererList->SetSelection(sel); } -namespace +static uint64_t append_uint32_t(uint64_t first, uint64_t second) { - uint64_t append_uint32_t(uint64_t first, uint64_t second) - { - return (first << 32) | second; - } + return (first << 32) | second; } void BasicVideoData::LoadResolutionData() -- GitLab