Merge branch 'master' into charmmfixes

04042076 · Andreas Krämer · d59f19e4 · 2ff59259 · 04042076 · 04042076
Commit 04042076 authored Aug 02, 2019 by Andreas Krämer
20 changed files
--- a/libraries/asmjit/base/cpuinfo.cpp
+++ b/libraries/asmjit/base/cpuinfo.cpp
--- a/libraries/asmjit/base/cpuinfo.h
+++ b/libraries/asmjit/base/cpuinfo.h
--- a/libraries/asmjit/base/cputicks.cpp
+++ b/libraries/asmjit/base/cputicks.cpp
--- a/libraries/asmjit/base/cputicks.h
+++ b/libraries/asmjit/base/cputicks.h
-// [AsmJit]
-// Complete x86/x64 JIT and Remote Assembler for C++.
-//
-// [License]
-// Zlib - See LICENSE.md file in the package.
-
-// [Guard]
-#ifndef _ASMJIT_BASE_CPUTICKS_H
-#define _ASMJIT_BASE_CPUTICKS_H
-
-// [Dependencies - AsmJit]
-#include "../base/globals.h"
-
-// [Api-Begin]
-#include "../apibegin.h"
-
-namespace asmjit {
-
-//! \addtogroup asmjit_base_util
-//! \{
-
-// ============================================================================
-// [asmjit::CpuTicks]
-// ============================================================================
-
-//! CPU ticks utilities.
-struct CpuTicks {
-  //! Get the current CPU ticks for benchmarking (1ms resolution).
-  static ASMJIT_API uint32_t now();
-};
-
-//! \}
-
-} // asmjit namespace
-
-// [Api-End]
-#include "../apiend.h"
-
-// [Guard]
-#endif // _ASMJIT_BASE_CPUTICKS_H
--- a/libraries/asmjit/base/error.h
+++ b/libraries/asmjit/base/error.h
--- a/libraries/asmjit/base/func.cpp
+++ b/libraries/asmjit/base/func.cpp
--- a/libraries/asmjit/base/func.h
+++ b/libraries/asmjit/base/func.h
--- a/libraries/asmjit/base/globals.cpp
+++ b/libraries/asmjit/base/globals.cpp
--- a/libraries/asmjit/base/globals.h
+++ b/libraries/asmjit/base/globals.h
--- a/libraries/asmjit/base/inst.cpp
+++ b/libraries/asmjit/base/inst.cpp
--- a/libraries/asmjit/base/inst.h
+++ b/libraries/asmjit/base/inst.h
--- a/libraries/asmjit/base/intutil.cpp
+++ b/libraries/asmjit/base/intutil.cpp
--- a/libraries/asmjit/base/intutil.h
+++ b/libraries/asmjit/base/intutil.h
--- a/libraries/asmjit/base/logger.cpp
+++ b/libraries/asmjit/base/logger.cpp
--- a/libraries/asmjit/base/logging.cpp
+++ b/libraries/asmjit/base/logging.cpp
--- a/libraries/asmjit/base/logger.h
+++ b/libraries/asmjit/base/logger.h
--- a/libraries/asmjit/base/misc_p.h
+++ b/libraries/asmjit/base/misc_p.h
--- a/libraries/asmjit/base/operand.cpp
+++ b/libraries/asmjit/base/operand.cpp
--- a/libraries/asmjit/base/operand.h
+++ b/libraries/asmjit/base/operand.h
--- a/libraries/asmjit/base/osutils.cpp
+++ b/libraries/asmjit/base/osutils.cpp