refactor: Rename common.h to macros.h, now that it only contains macros (#1113)
Issue #1047 (CMake porting)
This commit is contained in:
parent
2a31f412d3
commit
f45019d478
|
@ -7,7 +7,7 @@
|
||||||
#include "packager/file/callback_file.h"
|
#include "packager/file/callback_file.h"
|
||||||
|
|
||||||
#include "glog/logging.h"
|
#include "glog/logging.h"
|
||||||
#include "packager/common.h"
|
#include "packager/macros.h"
|
||||||
|
|
||||||
namespace shaka {
|
namespace shaka {
|
||||||
|
|
||||||
|
|
|
@ -11,8 +11,8 @@
|
||||||
|
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|
||||||
#include "packager/common.h"
|
|
||||||
#include "packager/file/public/buffer_callback_params.h"
|
#include "packager/file/public/buffer_callback_params.h"
|
||||||
|
#include "packager/macros.h"
|
||||||
#include "packager/status/status.h"
|
#include "packager/status/status.h"
|
||||||
|
|
||||||
namespace shaka {
|
namespace shaka {
|
||||||
|
|
|
@ -14,8 +14,8 @@
|
||||||
#include "absl/strings/str_format.h"
|
#include "absl/strings/str_format.h"
|
||||||
#include "glog/logging.h"
|
#include "glog/logging.h"
|
||||||
|
|
||||||
#include "packager/common.h"
|
|
||||||
#include "packager/file/thread_pool.h"
|
#include "packager/file/thread_pool.h"
|
||||||
|
#include "packager/macros.h"
|
||||||
#include "packager/version/version.h"
|
#include "packager/version/version.h"
|
||||||
|
|
||||||
ABSL_FLAG(std::string,
|
ABSL_FLAG(std::string,
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
#include "absl/synchronization/mutex.h"
|
#include "absl/synchronization/mutex.h"
|
||||||
#include "packager/common.h"
|
#include "packager/macros.h"
|
||||||
|
|
||||||
namespace shaka {
|
namespace shaka {
|
||||||
|
|
||||||
|
|
|
@ -7,13 +7,12 @@
|
||||||
#ifndef PACKAGER_FILE_THREAD_POOL_H_
|
#ifndef PACKAGER_FILE_THREAD_POOL_H_
|
||||||
#define PACKAGER_FILE_THREAD_POOL_H_
|
#define PACKAGER_FILE_THREAD_POOL_H_
|
||||||
|
|
||||||
#include "packager/common.h"
|
|
||||||
|
|
||||||
#include <functional>
|
#include <functional>
|
||||||
#include <queue>
|
#include <queue>
|
||||||
|
|
||||||
#include "absl/base/thread_annotations.h"
|
#include "absl/base/thread_annotations.h"
|
||||||
#include "absl/synchronization/mutex.h"
|
#include "absl/synchronization/mutex.h"
|
||||||
|
#include "packager/macros.h"
|
||||||
|
|
||||||
namespace shaka {
|
namespace shaka {
|
||||||
|
|
||||||
|
|
|
@ -10,8 +10,8 @@
|
||||||
#include "absl/strings/numbers.h"
|
#include "absl/strings/numbers.h"
|
||||||
#include "absl/strings/str_split.h"
|
#include "absl/strings/str_split.h"
|
||||||
#include "glog/logging.h"
|
#include "glog/logging.h"
|
||||||
#include "packager/common.h"
|
|
||||||
#include "packager/kv_pairs/kv_pairs.h"
|
#include "packager/kv_pairs/kv_pairs.h"
|
||||||
|
#include "packager/macros.h"
|
||||||
|
|
||||||
ABSL_FLAG(std::string,
|
ABSL_FLAG(std::string,
|
||||||
udp_interface_address,
|
udp_interface_address,
|
||||||
|
|
|
@ -4,15 +4,13 @@
|
||||||
// license that can be found in the LICENSE file or at
|
// license that can be found in the LICENSE file or at
|
||||||
// https://developers.google.com/open-source/licenses/bsd
|
// https://developers.google.com/open-source/licenses/bsd
|
||||||
|
|
||||||
#ifndef PACKAGER_COMMON_H_
|
#ifndef PACKAGER_MACROS_H_
|
||||||
#define PACKAGER_COMMON_H_
|
#define PACKAGER_MACROS_H_
|
||||||
|
|
||||||
#include <type_traits>
|
#include <type_traits>
|
||||||
|
|
||||||
#include "absl/base/macros.h"
|
#include "absl/base/macros.h"
|
||||||
|
|
||||||
namespace shaka {
|
|
||||||
|
|
||||||
/// A macro to disable copying and assignment. Usage:
|
/// A macro to disable copying and assignment. Usage:
|
||||||
/// class Foo {
|
/// class Foo {
|
||||||
/// private:
|
/// private:
|
||||||
|
@ -34,6 +32,4 @@ namespace shaka {
|
||||||
/// You can use the insertion operator to add specific logs to this.
|
/// You can use the insertion operator to add specific logs to this.
|
||||||
#define NOTIMPLEMENTED() LOG(ERROR) << "NOTIMPLEMENTED: "
|
#define NOTIMPLEMENTED() LOG(ERROR) << "NOTIMPLEMENTED: "
|
||||||
|
|
||||||
} // namespace shaka
|
#endif // PACKAGER_MACROS_H_
|
||||||
|
|
||||||
#endif // PACKAGER_COMMON_H_
|
|
|
@ -8,7 +8,7 @@
|
||||||
|
|
||||||
#include "absl/strings/str_format.h"
|
#include "absl/strings/str_format.h"
|
||||||
#include "glog/logging.h"
|
#include "glog/logging.h"
|
||||||
#include "packager/common.h"
|
#include "packager/macros.h"
|
||||||
|
|
||||||
namespace shaka {
|
namespace shaka {
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue