Skip to content

Commit

Permalink
Adding NOLINT for typedefs.h and common_types.h
Browse files Browse the repository at this point in the history
Now that we have moved WebRTC from src/webrtc to src/, common_types.h
and typedefs.h are triggering a cpplint error.

The cpplint complaint is:
Include the directory when naming .h files  [build/include] [4]

This CL disables the error but we have to remove these two headers
from the root directory.

NOPRESUBMIT=true

Bug: webrtc:5876
Change-Id: I08e1b69aadcc4b28ab83bf25e3819d135d41d333
Reviewed-on: https://webrtc-review.googlesource.com/1577
Commit-Queue: Mirko Bonadei <[email protected]>
Reviewed-by: Henrik Kjellander <[email protected]>
Reviewed-by: Karl Wiberg <[email protected]>
Cr-Commit-Position: refs/heads/master@{#19859}
  • Loading branch information
MirkoBonadei authored and Commit Bot committed Sep 15, 2017
1 parent 563934e commit 7120742
Show file tree
Hide file tree
Showing 549 changed files with 595 additions and 595 deletions.
2 changes: 1 addition & 1 deletion api/audio_codecs/L16/audio_decoder_L16.cc
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

#include "api/audio_codecs/L16/audio_decoder_L16.h"

#include "common_types.h"
#include "common_types.h" // NOLINT(build/include)
#include "modules/audio_coding/codecs/pcm16b/audio_decoder_pcm16b.h"
#include "modules/audio_coding/codecs/pcm16b/pcm16b_common.h"
#include "rtc_base/ptr_util.h"
Expand Down
2 changes: 1 addition & 1 deletion api/audio_codecs/L16/audio_encoder_L16.cc
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

#include "api/audio_codecs/L16/audio_encoder_L16.h"

#include "common_types.h"
#include "common_types.h" // NOLINT(build/include)
#include "modules/audio_coding/codecs/pcm16b/audio_encoder_pcm16b.h"
#include "modules/audio_coding/codecs/pcm16b/pcm16b_common.h"
#include "rtc_base/ptr_util.h"
Expand Down
2 changes: 1 addition & 1 deletion api/audio_codecs/audio_decoder.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#include "api/optional.h"
#include "rtc_base/buffer.h"
#include "rtc_base/constructormagic.h"
#include "typedefs.h"
#include "typedefs.h" // NOLINT(build/include)

namespace webrtc {

Expand Down
2 changes: 1 addition & 1 deletion api/audio_codecs/audio_encoder.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#include "api/optional.h"
#include "rtc_base/buffer.h"
#include "rtc_base/deprecation.h"
#include "typedefs.h"
#include "typedefs.h" // NOLINT(build/include)

namespace webrtc {

Expand Down
2 changes: 1 addition & 1 deletion api/audio_codecs/audio_format.cc
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

#include "api/audio_codecs/audio_format.h"

#include "common_types.h"
#include "common_types.h" // NOLINT(build/include)

namespace webrtc {

Expand Down
2 changes: 1 addition & 1 deletion api/audio_codecs/g711/audio_decoder_g711.cc
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include <memory>
#include <vector>

#include "common_types.h"
#include "common_types.h" // NOLINT(build/include)
#include "modules/audio_coding/codecs/g711/audio_decoder_pcm.h"
#include "rtc_base/ptr_util.h"
#include "rtc_base/safe_conversions.h"
Expand Down
2 changes: 1 addition & 1 deletion api/audio_codecs/g711/audio_encoder_g711.cc
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include <memory>
#include <vector>

#include "common_types.h"
#include "common_types.h" // NOLINT(build/include)
#include "modules/audio_coding/codecs/g711/audio_encoder_pcm.h"
#include "rtc_base/ptr_util.h"
#include "rtc_base/safe_conversions.h"
Expand Down
2 changes: 1 addition & 1 deletion api/audio_codecs/g722/audio_decoder_g722.cc
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include <memory>
#include <vector>

#include "common_types.h"
#include "common_types.h" // NOLINT(build/include)
#include "modules/audio_coding/codecs/g722/audio_decoder_g722.h"
#include "rtc_base/ptr_util.h"
#include "rtc_base/safe_conversions.h"
Expand Down
2 changes: 1 addition & 1 deletion api/audio_codecs/g722/audio_encoder_g722.cc
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include <memory>
#include <vector>

#include "common_types.h"
#include "common_types.h" // NOLINT(build/include)
#include "modules/audio_coding/codecs/g722/audio_encoder_g722.h"
#include "rtc_base/ptr_util.h"
#include "rtc_base/safe_conversions.h"
Expand Down
2 changes: 1 addition & 1 deletion api/audio_codecs/ilbc/audio_decoder_ilbc.cc
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include <memory>
#include <vector>

#include "common_types.h"
#include "common_types.h" // NOLINT(build/include)
#include "modules/audio_coding/codecs/ilbc/audio_decoder_ilbc.h"
#include "rtc_base/ptr_util.h"

Expand Down
2 changes: 1 addition & 1 deletion api/audio_codecs/ilbc/audio_encoder_ilbc.cc
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include <memory>
#include <vector>

#include "common_types.h"
#include "common_types.h" // NOLINT(build/include)
#include "modules/audio_coding/codecs/ilbc/audio_encoder_ilbc.h"
#include "rtc_base/ptr_util.h"
#include "rtc_base/safe_conversions.h"
Expand Down
2 changes: 1 addition & 1 deletion api/audio_codecs/isac/audio_decoder_isac_fix.cc
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

#include "api/audio_codecs/isac/audio_decoder_isac_fix.h"

#include "common_types.h"
#include "common_types.h" // NOLINT(build/include)
#include "modules/audio_coding/codecs/isac/fix/include/audio_decoder_isacfix.h"
#include "rtc_base/ptr_util.h"

Expand Down
2 changes: 1 addition & 1 deletion api/audio_codecs/isac/audio_decoder_isac_float.cc
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

#include "api/audio_codecs/isac/audio_decoder_isac_float.h"

#include "common_types.h"
#include "common_types.h" // NOLINT(build/include)
#include "modules/audio_coding/codecs/isac/main/include/audio_decoder_isac.h"
#include "rtc_base/ptr_util.h"

Expand Down
2 changes: 1 addition & 1 deletion api/audio_codecs/isac/audio_encoder_isac_fix.cc
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

#include "api/audio_codecs/isac/audio_encoder_isac_fix.h"

#include "common_types.h"
#include "common_types.h" // NOLINT(build/include)
#include "modules/audio_coding/codecs/isac/fix/include/audio_encoder_isacfix.h"
#include "rtc_base/ptr_util.h"
#include "rtc_base/string_to_number.h"
Expand Down
2 changes: 1 addition & 1 deletion api/audio_codecs/isac/audio_encoder_isac_float.cc
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

#include "api/audio_codecs/isac/audio_encoder_isac_float.h"

#include "common_types.h"
#include "common_types.h" // NOLINT(build/include)
#include "modules/audio_coding/codecs/isac/main/include/audio_encoder_isac.h"
#include "rtc_base/ptr_util.h"
#include "rtc_base/string_to_number.h"
Expand Down
2 changes: 1 addition & 1 deletion api/audio_codecs/opus/audio_decoder_opus.cc
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#include <utility>
#include <vector>

#include "common_types.h"
#include "common_types.h" // NOLINT(build/include)
#include "modules/audio_coding/codecs/opus/audio_decoder_opus.h"
#include "rtc_base/ptr_util.h"

Expand Down
2 changes: 1 addition & 1 deletion api/ortc/rtptransportinterface.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#include "api/optional.h"
#include "api/ortc/packettransportinterface.h"
#include "api/rtcerror.h"
#include "common_types.h"
#include "common_types.h" // NOLINT(build/include)

namespace webrtc {

Expand Down
4 changes: 2 additions & 2 deletions api/video_codecs/video_decoder.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
#include <vector>

#include "api/video/video_frame.h"
#include "common_types.h"
#include "common_types.h" // NOLINT(build/include)
#include "common_video/include/video_frame.h"
#include "typedefs.h"
#include "typedefs.h" // NOLINT(build/include)

namespace webrtc {

Expand Down
4 changes: 2 additions & 2 deletions api/video_codecs/video_encoder.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@

#include "api/optional.h"
#include "api/video/video_frame.h"
#include "common_types.h"
#include "common_types.h" // NOLINT(build/include)
#include "common_video/include/video_frame.h"
#include "rtc_base/checks.h"
#include "typedefs.h"
#include "typedefs.h" // NOLINT(build/include)

namespace webrtc {

Expand Down
2 changes: 1 addition & 1 deletion audio/utility/audio_frame_operations.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

#include <stddef.h>

#include "typedefs.h"
#include "typedefs.h" // NOLINT(build/include)

namespace webrtc {

Expand Down
4 changes: 2 additions & 2 deletions call/audio_receive_stream.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
#include "api/rtpparameters.h"
#include "api/rtpreceiverinterface.h"
#include "call/rtp_config.h"
#include "common_types.h"
#include "common_types.h" // NOLINT(build/include)
#include "rtc_base/scoped_ref_ptr.h"
#include "typedefs.h"
#include "typedefs.h" // NOLINT(build/include)

namespace webrtc {
class AudioSinkInterface;
Expand Down
2 changes: 1 addition & 1 deletion call/audio_send_stream.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include "api/rtpparameters.h"
#include "call/rtp_config.h"
#include "rtc_base/scoped_ref_ptr.h"
#include "typedefs.h"
#include "typedefs.h" // NOLINT(build/include)

namespace webrtc {

Expand Down
2 changes: 1 addition & 1 deletion call/call.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include "call/rtp_transport_controller_send_interface.h"
#include "call/video_receive_stream.h"
#include "call/video_send_stream.h"
#include "common_types.h"
#include "common_types.h" // NOLINT(build/include)
#include "rtc_base/networkroute.h"
#include "rtc_base/platform_file.h"
#include "rtc_base/socket.h"
Expand Down
2 changes: 1 addition & 1 deletion call/fake_rtp_transport_controller_send.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#define CALL_FAKE_RTP_TRANSPORT_CONTROLLER_SEND_H_

#include "call/rtp_transport_controller_send_interface.h"
#include "common_types.h"
#include "common_types.h" // NOLINT(build/include)
#include "modules/congestion_controller/include/send_side_congestion_controller.h"
#include "modules/pacing/packet_router.h"

Expand Down
2 changes: 1 addition & 1 deletion call/flexfec_receive_stream.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#include "api/call/transport.h"
#include "api/rtpparameters.h"
#include "call/rtp_packet_sink_interface.h"
#include "common_types.h"
#include "common_types.h" // NOLINT(build/include)

namespace webrtc {

Expand Down
2 changes: 1 addition & 1 deletion call/rtcp_demuxer.cc
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

#include "call/rtcp_packet_sink_interface.h"
#include "call/rtp_rtcp_demuxer_helper.h"
#include "common_types.h"
#include "common_types.h" // NOLINT(build/include)
#include "rtc_base/checks.h"

namespace webrtc {
Expand Down
2 changes: 1 addition & 1 deletion call/rtcp_demuxer_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#include <set>

#include "call/rtcp_packet_sink_interface.h"
#include "common_types.h"
#include "common_types.h" // NOLINT(build/include)
#include "modules/rtp_rtcp/source/rtcp_packet/bye.h"
#include "rtc_base/arraysize.h"
#include "rtc_base/basictypes.h"
Expand Down
2 changes: 1 addition & 1 deletion call/rtp_demuxer_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

#include "call/ssrc_binding_observer.h"
#include "call/test/mock_rtp_packet_sink_interface.h"
#include "common_types.h"
#include "common_types.h" // NOLINT(build/include)
#include "modules/rtp_rtcp/include/rtp_header_extension_map.h"
#include "modules/rtp_rtcp/source/rtp_header_extensions.h"
#include "modules/rtp_rtcp/source/rtp_packet_received.h"
Expand Down
2 changes: 1 addition & 1 deletion call/rtp_transport_controller_send.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#define CALL_RTP_TRANSPORT_CONTROLLER_SEND_H_

#include "call/rtp_transport_controller_send_interface.h"
#include "common_types.h"
#include "common_types.h" // NOLINT(build/include)
#include "modules/congestion_controller/include/send_side_congestion_controller.h"
#include "rtc_base/constructormagic.h"

Expand Down
4 changes: 2 additions & 2 deletions call/video_config.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
#include <vector>

#include "api/optional.h"
#include "common_types.h"
#include "common_types.h" // NOLINT(build/include)
#include "rtc_base/basictypes.h"
#include "rtc_base/refcount.h"
#include "rtc_base/scoped_ref_ptr.h"
#include "typedefs.h"
#include "typedefs.h" // NOLINT(build/include)

namespace webrtc {

Expand Down
2 changes: 1 addition & 1 deletion call/video_receive_stream.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#include "api/call/transport.h"
#include "api/rtpparameters.h"
#include "call/rtp_config.h"
#include "common_types.h"
#include "common_types.h" // NOLINT(build/include)
#include "common_video/include/frame_callback.h"
#include "media/base/videosinkinterface.h"
#include "rtc_base/platform_file.h"
Expand Down
2 changes: 1 addition & 1 deletion call/video_send_stream.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#include "api/rtpparameters.h"
#include "call/rtp_config.h"
#include "call/video_config.h"
#include "common_types.h"
#include "common_types.h" // NOLINT(build/include)
#include "common_video/include/frame_callback.h"
#include "media/base/videosinkinterface.h"
#include "media/base/videosourceinterface.h"
Expand Down
2 changes: 1 addition & 1 deletion common_audio/audio_util.cc
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

#include "common_audio/include/audio_util.h"

#include "typedefs.h"
#include "typedefs.h" // NOLINT(build/include)

namespace webrtc {

Expand Down
2 changes: 1 addition & 1 deletion common_audio/audio_util_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include "common_audio/include/audio_util.h"
#include "test/gmock.h"
#include "test/gtest.h"
#include "typedefs.h"
#include "typedefs.h" // NOLINT(build/include)

namespace webrtc {
namespace {
Expand Down
2 changes: 1 addition & 1 deletion common_audio/include/audio_util.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#include <cstring>

#include "rtc_base/checks.h"
#include "typedefs.h"
#include "typedefs.h" // NOLINT(build/include)

namespace webrtc {

Expand Down
2 changes: 1 addition & 1 deletion common_audio/resampler/include/push_resampler.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

#include <memory>

#include "typedefs.h"
#include "typedefs.h" // NOLINT(build/include)

namespace webrtc {

Expand Down
2 changes: 1 addition & 1 deletion common_audio/resampler/include/resampler.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

#include <stddef.h>

#include "typedefs.h"
#include "typedefs.h" // NOLINT(build/include)

namespace webrtc {

Expand Down
2 changes: 1 addition & 1 deletion common_audio/resampler/push_sinc_resampler.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

#include "common_audio/resampler/sinc_resampler.h"
#include "rtc_base/constructormagic.h"
#include "typedefs.h"
#include "typedefs.h" // NOLINT(build/include)

namespace webrtc {

Expand Down
2 changes: 1 addition & 1 deletion common_audio/resampler/push_sinc_resampler_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#include "rtc_base/timeutils.h"
#include "test/gmock.h"
#include "test/gtest.h"
#include "typedefs.h"
#include "typedefs.h" // NOLINT(build/include)

namespace webrtc {
namespace {
Expand Down
2 changes: 1 addition & 1 deletion common_audio/resampler/sinc_resampler.cc
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@

#include "rtc_base/checks.h"
#include "system_wrappers/include/cpu_features_wrapper.h"
#include "typedefs.h"
#include "typedefs.h" // NOLINT(build/include)

namespace webrtc {

Expand Down
2 changes: 1 addition & 1 deletion common_audio/resampler/sinc_resampler.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#include "rtc_base/constructormagic.h"
#include "rtc_base/gtest_prod_util.h"
#include "system_wrappers/include/aligned_malloc.h"
#include "typedefs.h"
#include "typedefs.h" // NOLINT(build/include)

namespace webrtc {

Expand Down
2 changes: 1 addition & 1 deletion common_audio/signal_processing/complex_fft_tables.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#ifndef COMMON_AUDIO_SIGNAL_PROCESSING_COMPLEX_FFT_TABLES_H_
#define COMMON_AUDIO_SIGNAL_PROCESSING_COMPLEX_FFT_TABLES_H_

#include "typedefs.h"
#include "typedefs.h" // NOLINT(build/include)

static const int16_t kSinTable1024[] = {
0, 201, 402, 603, 804, 1005, 1206, 1406,
Expand Down
Loading

0 comments on commit 7120742

Please sign in to comment.