Remove #pragma once
BUG=1830
R=tina.legrand@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/1568004
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@4130 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/modules/audio_coding/codecs/cng/test/StdAfx.h b/modules/audio_coding/codecs/cng/test/StdAfx.h
index dd6c445..c29d638 100644
--- a/modules/audio_coding/codecs/cng/test/StdAfx.h
+++ b/modules/audio_coding/codecs/cng/test/StdAfx.h
@@ -16,10 +16,6 @@
#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_CNG_MAIN_TEST_STDAFX_H_
#define WEBRTC_MODULES_AUDIO_CODING_CODECS_CNG_MAIN_TEST_STDAFX_H_
-#if _MSC_VER > 1000
-#pragma once
-#endif // _MSC_VER > 1000
-
#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
#include <stdio.h>
diff --git a/modules/audio_device/win/audio_device_core_win.h b/modules/audio_device/win/audio_device_core_win.h
index 24a136f..b1efec4 100644
--- a/modules/audio_device/win/audio_device_core_win.h
+++ b/modules/audio_device/win/audio_device_core_win.h
@@ -8,14 +8,13 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_CORE_WIN_H
-#define WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_CORE_WIN_H
+#ifndef WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_CORE_WIN_H_
+#define WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_CORE_WIN_H_
#if (_MSC_VER >= 1400) // only include for VS 2005 and higher
#include "audio_device_generic.h"
-#pragma once
#include <wmcodecdsp.h> // CLSID_CWMAudioAEC
// (must be before audioclient.h)
#include <Audioclient.h> // WASAPI
@@ -380,5 +379,4 @@
} // namespace webrtc
-#endif // WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_CORE_WIN_H
-
+#endif // WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_CORE_WIN_H_
diff --git a/test/channel_transport/udp_socket2_manager_win.h b/test/channel_transport/udp_socket2_manager_win.h
index 758c339..0eef997 100644
--- a/test/channel_transport/udp_socket2_manager_win.h
+++ b/test/channel_transport/udp_socket2_manager_win.h
@@ -11,10 +11,6 @@
#ifndef WEBRTC_TEST_CHANNEL_TRANSPORT_UDP_SOCKET2_MANAGER_WINDOWS_H_
#define WEBRTC_TEST_CHANNEL_TRANSPORT_UDP_SOCKET2_MANAGER_WINDOWS_H_
-#if _MSC_VER > 1000
-#pragma once
-#endif
-
#include <winsock2.h>
#include "webrtc/system_wrappers/interface/atomic32.h"
diff --git a/test/testsupport/gtest_prod_util.h b/test/testsupport/gtest_prod_util.h
index 989d94d..5370589 100644
--- a/test/testsupport/gtest_prod_util.h
+++ b/test/testsupport/gtest_prod_util.h
@@ -10,7 +10,6 @@
#ifndef WEBRTC_TEST_TESTSUPPORT_GTEST_PROD_UTIL_H_
#define WEBRTC_TEST_TESTSUPPORT_GTEST_PROD_UTIL_H_
-#pragma once
// Define our own version of FRIEND_TEST here rather than including
// gtest_prod.h to avoid depending on any part of GTest in production code.
diff --git a/voice_engine/dtmf_inband.h b/voice_engine/dtmf_inband.h
index 84f83a3..c867143 100644
--- a/voice_engine/dtmf_inband.h
+++ b/voice_engine/dtmf_inband.h
@@ -8,12 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_VOICE_ENGINE_DTMF_INBAND_H
-#define WEBRTC_VOICE_ENGINE_DTMF_INBAND_H
-
-#if _MSC_VER > 1000
-#pragma once
-#endif
+#ifndef WEBRTC_VOICE_ENGINE_DTMF_INBAND_H_
+#define WEBRTC_VOICE_ENGINE_DTMF_INBAND_H_
#include "webrtc/typedefs.h"
#include "webrtc/voice_engine/voice_engine_defines.h"
@@ -88,4 +84,4 @@
} // namespace webrtc
-#endif // #ifndef WEBRTC_VOICE_ENGINE_DTMF_INBAND_H
+#endif // #ifndef WEBRTC_VOICE_ENGINE_DTMF_INBAND_H_
diff --git a/voice_engine/test/win_test/WinTest.h b/voice_engine/test/win_test/WinTest.h
index d012ce6..7320360 100644
--- a/voice_engine/test/win_test/WinTest.h
+++ b/voice_engine/test/win_test/WinTest.h
@@ -7,8 +7,8 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
-
-#pragma once
+#ifndef WEBRTC_VOICE_ENGINE_TEST_WIN_TEST_WINTEST_H_
+#define WEBRTC_VOICE_ENGINE_TEST_WIN_TEST_WINTEST_H_
#ifndef __AFXWIN_H__
#error "include 'stdafx.h' before including this file for PCH"
@@ -36,3 +36,5 @@
};
extern CWinTestApp theApp;
+
+#endif // WEBRTC_VOICE_ENGINE_TEST_WIN_TEST_WINTEST_H_
diff --git a/voice_engine/test/win_test/WinTestDlg.h b/voice_engine/test/win_test/WinTestDlg.h
index 5c7f5b6..65dcf38 100644
--- a/voice_engine/test/win_test/WinTestDlg.h
+++ b/voice_engine/test/win_test/WinTestDlg.h
@@ -7,8 +7,8 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
-
-#pragma once
+#ifndef WEBRTC_VOICE_ENGINE_TEST_WIN_TEST_WINTESTDLG_H_
+#define WEBRTC_VOICE_ENGINE_TEST_WIN_TEST_WINTESTDLG_H_
#if (_MSC_VER >= 1400)
#define PRINT_GET_RESULT(...) \
@@ -278,4 +278,5 @@
afx_msg void OnBnClickedButtonClearErrorCallback();
afx_msg void OnBnClickedCheckBwe1();
};
-#pragma once
+
+#endif // WEBRTC_VOICE_ENGINE_TEST_WIN_TEST_WINTESTDLG_H_
diff --git a/voice_engine/test/win_test/stdafx.h b/voice_engine/test/win_test/stdafx.h
index b4d875c..17b3c30 100644
--- a/voice_engine/test/win_test/stdafx.h
+++ b/voice_engine/test/win_test/stdafx.h
@@ -8,12 +8,13 @@
* be found in the AUTHORS file in the root of the source tree.
*/
+#ifndef WEBRTC_VOICE_ENGINE_TEST_WIN_TEST_STDAFX_H_
+#define WEBRTC_VOICE_ENGINE_TEST_WIN_TEST_STDAFX_H_
+
// stdafx.h : include file for standard system include files,
// or project specific include files that are used frequently,
// but are changed infrequently
-#pragma once
-
#ifndef _SECURE_ATL
#define _SECURE_ATL 1
#endif
@@ -48,10 +49,6 @@
#include <afxwin.h> // MFC core and standard components
#include <afxext.h> // MFC extensions
-
-
-
-
#ifndef _AFX_NO_OLE_SUPPORT
#include <afxdtctl.h> // MFC support for Internet Explorer 4 Common Controls
#endif
@@ -59,14 +56,6 @@
#include <afxcmn.h> // MFC support for Windows Common Controls
#endif // _AFX_NO_AFXCMN_SUPPORT
-
-
-
-
-
-
-
-
#ifdef _UNICODE
#if defined _M_IX86
#pragma comment(linker,"/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='x86' publicKeyToken='6595b64144ccf1df' language='*'\"")
@@ -79,4 +68,4 @@
#endif
#endif
-
+#endif // WEBRTC_VOICE_ENGINE_TEST_WIN_TEST_STDAFX_H_