From: Peter Michael Green <plugwash@raspbian.org>
Date: Mon, 8 Jun 2020 07:17:12 +0000 (+0100)
Subject: Adjust code formatting to allow upstream boost1.71 patches to be applied.
X-Git-Tag: archive/raspbian/1%3.10.4+repack-1+rpi1~6
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=2202c32843c11faedf250a4c2591936a0c418ded;p=supercollider.git

Adjust code formatting to allow upstream boost1.71 patches to be applied.


Gbp-Pq: Name boost1.71-00-formatting
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bc9bc50..469b9cf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -253,8 +253,8 @@ if (NOT WIN32)
 endif()
 
 if(SYSTEM_BOOST)
-  set(Boost_USE_MULTITHREADED      ON)
-  find_package( Boost 1.50.0 COMPONENTS  thread system filesystem program_options regex test_exec_monitor )
+    set(Boost_USE_MULTITHREADED ON)
+    find_package( Boost 1.50.0 COMPONENTS  thread system filesystem program_options regex test_exec_monitor )
 endif()
 
 if (Boost_FOUND)
diff --git a/server/supernova/sc/sc_osc_handler.cpp b/server/supernova/sc/sc_osc_handler.cpp
index 6c7bfe0..75da5af 100644
--- a/server/supernova/sc/sc_osc_handler.cpp
+++ b/server/supernova/sc/sc_osc_handler.cpp
@@ -932,9 +932,7 @@ void sc_osc_handler::tcp_connection::handle_message()
 
 
 
-
-void sc_osc_handler::start_tcp_accept(void)
-{
+void sc_osc_handler::start_tcp_accept(void) {
     tcp_connection::pointer new_connection = tcp_connection::create(tcp_acceptor_.get_io_service());
 
     tcp_acceptor_.async_accept(new_connection->socket(),
diff --git a/server/supernova/sc/sc_osc_handler.hpp b/server/supernova/sc/sc_osc_handler.hpp
index db23f4b..3f488be 100644
--- a/server/supernova/sc/sc_osc_handler.hpp
+++ b/server/supernova/sc/sc_osc_handler.hpp
@@ -278,10 +278,7 @@ public:
     public:
         typedef std::shared_ptr<tcp_connection> pointer;
 
-        static pointer create(boost::asio::io_service& io_service)
-        {
-            return pointer(new tcp_connection(io_service));
-        }
+        static pointer create(boost::asio::io_service& io_service) { return pointer(new tcp_connection(io_service)); }
 
         tcp::socket& socket()
         {
@@ -296,9 +293,7 @@ public:
         }
 
     private:
-        tcp_connection(boost::asio::io_service& io_service)
-            : socket_(io_service)
-        {}
+        tcp_connection(boost::asio::io_service& io_service): socket_(io_service) {}
 
         void send(const char *data, size_t length) override final;
 
diff --git a/server/supernova/sc/sc_synthdef.hpp b/server/supernova/sc/sc_synthdef.hpp
index 2f7988f..79c2d26 100644
--- a/server/supernova/sc/sc_synthdef.hpp
+++ b/server/supernova/sc/sc_synthdef.hpp
@@ -35,10 +35,12 @@ namespace nova {
 
 class sc_synthdef
 {
-    typedef std::vector<float, boost::alignment::aligned_allocator<float, 64> > float_vector;
-    typedef std::vector<char, boost::alignment::aligned_allocator<char, 64> > char_vector;
+    typedef std::vector<float, boost::alignment::aligned_allocator<float, 64>> float_vector;
+    typedef std::vector<char, boost::alignment::aligned_allocator<char, 64>> char_vector;
 #if BOOST_VERSION > 107000
-    typedef std::map<symbol, int32_t, std::less<symbol>, boost::alignment::aligned_allocator<std::pair<symbol, int32_t>, 64>> parameter_index_map_t;
+    typedef std::map<symbol, int32_t, std::less<symbol>,
+                     boost::alignment::aligned_allocator<std::pair<symbol, int32_t>, 64>>
+        parameter_index_map_t;
 #else
     typedef std::map<symbol, int32_t, std::less<symbol>> parameter_index_map_t;
 #endif