Tree: clang-format without the include sorting

Author: marcusmueller

cmake/msvc/config.h

@@ -9,7 +9,7 @@
 // enable inline functions for C code
 ////////////////////////////////////////////////////////////////////////
 #ifndef __cplusplus
-#  define inline __inline
+#define inline __inline
 #endif
 
 ////////////////////////////////////////////////////////////////////////
@@ -23,12 +23,21 @@ typedef ptrdiff_t ssize_t;
 ////////////////////////////////////////////////////////////////////////
 #if _MSC_VER < 1800
 #include <math.h>
-static inline long lrint(double x){return (long)(x > 0.0 ? x + 0.5 : x - 0.5);}
-static inline long lrintf(float x){return (long)(x > 0.0f ? x + 0.5f : x - 0.5f);}
-static inline long long llrint(double x){return (long long)(x > 0.0 ? x + 0.5 : x - 0.5);}
-static inline long long llrintf(float x){return (long long)(x > 0.0f ? x + 0.5f : x - 0.5f);}
-static inline double rint(double x){return (x > 0.0)? floor(x + 0.5) : ceil(x - 0.5);}
-static inline float rintf(float x){return (x > 0.0f)? floorf(x + 0.5f) : ceilf(x - 0.5f);}
+static inline long lrint(double x) { return (long)(x > 0.0 ? x + 0.5 : x - 0.5); }
+static inline long lrintf(float x) { return (long)(x > 0.0f ? x + 0.5f : x - 0.5f); }
+static inline long long llrint(double x)
+{
+    return (long long)(x > 0.0 ? x + 0.5 : x - 0.5);
+}
+static inline long long llrintf(float x)
+{
+    return (long long)(x > 0.0f ? x + 0.5f : x - 0.5f);
+}
+static inline double rint(double x) { return (x > 0.0) ? floor(x + 0.5) : ceil(x - 0.5); }
+static inline float rintf(float x)
+{
+    return (x > 0.0f) ? floorf(x + 0.5f) : ceilf(x - 0.5f);
+}
 #endif
 
 ////////////////////////////////////////////////////////////////////////
@@ -43,7 +52,7 @@ static inline float rintf(float x){return (x > 0.0f)? floorf(x + 0.5f) : ceilf(x
 // random and srandom
 ////////////////////////////////////////////////////////////////////////
 #include <stdlib.h>
-static inline long int random (void) { return rand(); }
-static inline void srandom (unsigned int seed) { srand(seed); }
+static inline long int random(void) { return rand(); }
+static inline void srandom(unsigned int seed) { srand(seed); }
 
 #endif // _MSC_CONFIG_H_ ]

cmake/msvc/sys/time.h

@@ -9,8 +9,8 @@
 
 #if _MSC_VER < 1900
 struct timespec {
-time_t tv_sec; /*! \brief Seconds since 00:00:00 GMT, 1 January 1970 */
-long tv_nsec; /*! \brief Additional nanoseconds since tv_sec */
+    time_t tv_sec; /*! \brief Seconds since 00:00:00 GMT, 1 January 1970 */
+    long tv_nsec;  /*! \brief Additional nanoseconds since tv_sec */
 };
 #endif
 

docs/doxygen/other/shared_ptr_docstub.h

@@ -1,24 +1,23 @@
-namespace boost
-{
-  /*!
-   * \brief shared_ptr documentation stub
-   *
-   * \warning
-   * This isn't the real shared_ptr template.  It's just enough to get doxygen
-   * to draw pretty collaboration diagrams.
-   *
-   * An enhanced relative of scoped_ptr with reference counted copy semantics.
-   * The object pointed to is deleted when the last shared_ptr pointing to it
-   * is destroyed or reset.
-   */
+namespace boost {
+/*!
+ * \brief shared_ptr documentation stub
+ *
+ * \warning
+ * This isn't the real shared_ptr template.  It's just enough to get doxygen
+ * to draw pretty collaboration diagrams.
+ *
+ * An enhanced relative of scoped_ptr with reference counted copy semantics.
+ * The object pointed to is deleted when the last shared_ptr pointing to it
+ * is destroyed or reset.
+ */
 
-template<class T> class shared_ptr
+template <class T>
+class shared_ptr
 {
 public:
+    T* px; // contained pointer
 
-    T * px;                     // contained pointer
-
-};  // shared_ptr
+}; // shared_ptr
 
 
 } // namespace boost

docs/doxygen/other/vector_docstub.h

@@ -1,16 +1,16 @@
-namespace std
+namespace std {
+/*!
+ * \brief vector documentation stub
+ *
+ * \warning
+ * This isn't the real vector template.  It's just enough to get doxygen
+ * to draw pretty collaboration diagrams.
+ */
+template <class T>
+class vector
 {
-  /*!
-   * \brief vector documentation stub
-   *
-   * \warning
-   * This isn't the real vector template.  It's just enough to get doxygen
-   * to draw pretty collaboration diagrams.
-   */
-  template<class T> class vector
-  {
-  public:
-    T		*p;
-  };
+public:
+    T* p;
+};
 
 } // namespace std

gnuradio-runtime/apps/gnuradio-config-info.cc

@@ -34,74 +34,70 @@
 namespace po = boost::program_options;
 using boost::format;
 
-int
-main(int argc, char **argv)
+int main(int argc, char** argv)
 {
-  po::options_description desc((format("Program options: %1% [options]") % argv[0]).str());
-  po::variables_map vm;
-
-  desc.add_options()
-    ("help,h", "print help message")
-    ("prefix", "print GNU Radio installation prefix")
-    ("sysconfdir", "print GNU Radio system configuration directory")
-    ("prefsdir", "print GNU Radio preferences directory")
-    ("userprefsdir", "print GNU Radio user preferences directory")
-    ("prefs", "print GNU Radio preferences")
-    ("builddate", "print GNU Radio build date (RFC2822 format)")
-    ("enabled-components", "print GNU Radio build time enabled components")
-    ("cc", "print GNU Radio C compiler version")
-    ("cxx", "print GNU Radio C++ compiler version")
-    ("cflags", "print GNU Radio CFLAGS")
-    ("version,v", "print GNU Radio version")
-    ;
-
-  try {
-    po::store(po::parse_command_line(argc, argv, desc), vm);
-    po::notify(vm);
-  }
-  catch (po::error& error){
-    std::cerr << "Error: " << error.what() << std::endl << std::endl;
-    std::cerr << desc << std::endl;
-    return 1;
-  }
-
-  if(vm.size() == 0 || vm.count("help")) {
-    std::cout << desc << std::endl;
-    return 1;
-  }
-
-  if(vm.count("prefix"))
-    std::cout << gr::prefix() << std::endl;
-
-  if(vm.count("sysconfdir"))
-    std::cout << gr::sysconfdir() << std::endl;
-
-  if(vm.count("prefsdir"))
-    std::cout << gr::prefsdir() << std::endl;
-
-  if(vm.count("userprefsdir"))
-    std::cout << gr::userconf_path() << std::endl;
-
-  if(vm.count("prefs"))
-    std::cout << gr::prefs::singleton()->to_string() << std::endl;
-
-  if(vm.count("builddate"))
-    std::cout << gr::build_date() << std::endl;
-
-  if(vm.count("enabled-components"))
-    std::cout << gr::build_time_enabled_components() << std::endl;
-
-  if(vm.count("version"))
-    std::cout << gr::version() << std::endl;
-
-  if(vm.count("cc"))
-    std::cout << gr::c_compiler() << std::endl;
-
-  if(vm.count("cxx"))
-    std::cout << gr::cxx_compiler() << std::endl;
-
-  if(vm.count("cflags"))
-    std::cout << gr::compiler_flags() << std::endl;
-
-  return 0;
+    po::options_description desc(
+        (format("Program options: %1% [options]") % argv[0]).str());
+    po::variables_map vm;
+
+    desc.add_options()("help,h", "print help message")(
+        "prefix", "print GNU Radio installation prefix")(
+        "sysconfdir", "print GNU Radio system configuration directory")(
+        "prefsdir", "print GNU Radio preferences directory")(
+        "userprefsdir", "print GNU Radio user preferences directory")(
+        "prefs", "print GNU Radio preferences")(
+        "builddate", "print GNU Radio build date (RFC2822 format)")(
+        "enabled-components", "print GNU Radio build time enabled components")(
+        "cc", "print GNU Radio C compiler version")(
+        "cxx", "print GNU Radio C++ compiler version")(
+        "cflags", "print GNU Radio CFLAGS")("version,v", "print GNU Radio version");
+
+    try {
+        po::store(po::parse_command_line(argc, argv, desc), vm);
+        po::notify(vm);
+    } catch (po::error& error) {
+        std::cerr << "Error: " << error.what() << std::endl << std::endl;
+        std::cerr << desc << std::endl;
+        return 1;
+    }
+
+    if (vm.size() == 0 || vm.count("help")) {
+        std::cout << desc << std::endl;
+        return 1;
+    }
+
+    if (vm.count("prefix"))
+        std::cout << gr::prefix() << std::endl;
+
+    if (vm.count("sysconfdir"))
+        std::cout << gr::sysconfdir() << std::endl;
+
+    if (vm.count("prefsdir"))
+        std::cout << gr::prefsdir() << std::endl;
+
+    if (vm.count("userprefsdir"))
+        std::cout << gr::userconf_path() << std::endl;
+
+    if (vm.count("prefs"))
+        std::cout << gr::prefs::singleton()->to_string() << std::endl;
+
+    if (vm.count("builddate"))
+        std::cout << gr::build_date() << std::endl;
+
+    if (vm.count("enabled-components"))
+        std::cout << gr::build_time_enabled_components() << std::endl;
+
+    if (vm.count("version"))
+        std::cout << gr::version() << std::endl;
+
+    if (vm.count("cc"))
+        std::cout << gr::c_compiler() << std::endl;
+
+    if (vm.count("cxx"))
+        std::cout << gr::cxx_compiler() << std::endl;
+
+    if (vm.count("cflags"))
+        std::cout << gr::compiler_flags() << std::endl;
+
+    return 0;
 }

gnuradio-runtime/include/gnuradio/api.h

@@ -25,9 +25,9 @@
 #include <gnuradio/attributes.h>
 
 #ifdef gnuradio_runtime_EXPORTS
-#  define GR_RUNTIME_API __GR_ATTR_EXPORT
+#define GR_RUNTIME_API __GR_ATTR_EXPORT
 #else
-#  define GR_RUNTIME_API __GR_ATTR_IMPORT
+#define GR_RUNTIME_API __GR_ATTR_IMPORT
 #endif
 
 #endif /* INCLUDED_GR_RUNTIME_RUNTIME_API_H */

gnuradio-runtime/include/gnuradio/attributes.h

@@ -26,65 +26,69 @@
 // Cross-platform attribute macros
 ////////////////////////////////////////////////////////////////////////
 #if defined __GNUC__
-#  define __GR_ATTR_ALIGNED(x) __attribute__((aligned(x)))
-#  define __GR_ATTR_UNUSED     __attribute__((unused))
-#  define __GR_ATTR_INLINE     __attribute__((always_inline))
-#  define __GR_ATTR_DEPRECATED __attribute__((deprecated))
-#  if __GNUC__ >= 4
-#    define __GR_ATTR_EXPORT   __attribute__((visibility("default")))
-#    define __GR_ATTR_IMPORT   __attribute__((visibility("default")))
-#  else
-#    define __GR_ATTR_EXPORT
-#    define __GR_ATTR_IMPORT
-#  endif
+#define __GR_ATTR_ALIGNED(x) __attribute__((aligned(x)))
+#define __GR_ATTR_UNUSED __attribute__((unused))
+#define __GR_ATTR_INLINE __attribute__((always_inline))
+#define __GR_ATTR_DEPRECATED __attribute__((deprecated))
+#if __GNUC__ >= 4
+#define __GR_ATTR_EXPORT __attribute__((visibility("default")))
+#define __GR_ATTR_IMPORT __attribute__((visibility("default")))
+#else
+#define __GR_ATTR_EXPORT
+#define __GR_ATTR_IMPORT
+#endif
 #elif defined __clang__
-#  define __GR_ATTR_ALIGNED(x) __attribute__((aligned(x)))
-#  define __GR_ATTR_UNUSED     __attribute__((unused))
-#  define __GR_ATTR_INLINE     __attribute__((always_inline))
-#  define __GR_ATTR_DEPRECATED __attribute__((deprecated))
-#  define __GR_ATTR_EXPORT     __attribute__((visibility("default")))
-#  define __GR_ATTR_IMPORT     __attribute__((visibility("default")))
+#define __GR_ATTR_ALIGNED(x) __attribute__((aligned(x)))
+#define __GR_ATTR_UNUSED __attribute__((unused))
+#define __GR_ATTR_INLINE __attribute__((always_inline))
+#define __GR_ATTR_DEPRECATED __attribute__((deprecated))
+#define __GR_ATTR_EXPORT __attribute__((visibility("default")))
+#define __GR_ATTR_IMPORT __attribute__((visibility("default")))
 #elif _MSC_VER
-#  define __GR_ATTR_ALIGNED(x) __declspec(align(x))
-#  define __GR_ATTR_UNUSED
-#  define __GR_ATTR_INLINE     __forceinline
-#  define __GR_ATTR_DEPRECATED __declspec(deprecated)
-#  define __GR_ATTR_EXPORT     __declspec(dllexport)
-#  define __GR_ATTR_IMPORT     __declspec(dllimport)
+#define __GR_ATTR_ALIGNED(x) __declspec(align(x))
+#define __GR_ATTR_UNUSED
+#define __GR_ATTR_INLINE __forceinline
+#define __GR_ATTR_DEPRECATED __declspec(deprecated)
+#define __GR_ATTR_EXPORT __declspec(dllexport)
+#define __GR_ATTR_IMPORT __declspec(dllimport)
 #else
-#  define __GR_ATTR_ALIGNED(x)
-#  define __GR_ATTR_UNUSED
-#  define __GR_ATTR_INLINE
-#  define __GR_ATTR_DEPRECATED
-#  define __GR_ATTR_EXPORT
-#  define __GR_ATTR_IMPORT
+#define __GR_ATTR_ALIGNED(x)
+#define __GR_ATTR_UNUSED
+#define __GR_ATTR_INLINE
+#define __GR_ATTR_DEPRECATED
+#define __GR_ATTR_EXPORT
+#define __GR_ATTR_IMPORT
 #endif
 
 ////////////////////////////////////////////////////////////////////////
 // define inline when building C
 ////////////////////////////////////////////////////////////////////////
 #if defined(_MSC_VER) && !defined(__cplusplus) && !defined(inline)
-#  define inline __inline
+#define inline __inline
 #endif
 
 ////////////////////////////////////////////////////////////////////////
 // suppress warnings
 ////////////////////////////////////////////////////////////////////////
 #ifdef _MSC_VER
-#  pragma warning(disable: 4251) // class 'A<T>' needs to have dll-interface to be used by clients of class 'B'
-#  pragma warning(disable: 4275) // non dll-interface class ... used as base for dll-interface class ...
-#  pragma warning(disable: 4244) // conversion from 'double' to 'float', possible loss of data
-#  pragma warning(disable: 4305) // 'initializing' : truncation from 'double' to 'float'
-#  pragma warning(disable: 4290) // C++ exception specification ignored except to indicate a function is not __declspec(nothrow)
+#pragma warning(disable : 4251) // class 'A<T>' needs to have dll-interface to be used by
+                                // clients of class 'B'
+#pragma warning(disable : 4275) // non dll-interface class ... used as base for
+                                // dll-interface class ...
+#pragma warning( \
+    disable : 4244) // conversion from 'double' to 'float', possible loss of data
+#pragma warning(disable : 4305) // 'initializing' : truncation from 'double' to 'float'
+#pragma warning(disable : 4290) // C++ exception specification ignored except to indicate
+                                // a function is not __declspec(nothrow)
 #endif
 
 ////////////////////////////////////////////////////////////////////////
 // implement cross-compiler VLA macros
 ////////////////////////////////////////////////////////////////////////
 #ifdef _MSC_VER
-#  define __GR_VLA(TYPE, buf, size) TYPE * buf = (TYPE *) alloca(sizeof(TYPE) * (size))
+#define __GR_VLA(TYPE, buf, size) TYPE* buf = (TYPE*)alloca(sizeof(TYPE) * (size))
 #else
-#  define __GR_VLA(TYPE, buf, size) TYPE buf[size]
+#define __GR_VLA(TYPE, buf, size) TYPE buf[size]
 #endif
 
 #endif /* INCLUDED_GNURADIO_ATTRIBUTES_H */