Commit ec0b1362 by Corentin Wallez

Make util/win32 follow ANGLE conventions better

BUG=angleproject:892 Change-Id: I1ad366e16b135649fe1b0351081f9971db84df50 Reviewed-on: https://chromium-review.googlesource.com/269665Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org> Tested-by: 's avatarCorentin Wallez <cwallez@chromium.org>
parent f611316b
...@@ -4,6 +4,8 @@ ...@@ -4,6 +4,8 @@
// found in the LICENSE file. // found in the LICENSE file.
// //
// Win32Timer.cpp: Implementation of a high precision timer class on Windows
#include "win32/Win32Timer.h" #include "win32/Win32Timer.h"
Win32Timer::Win32Timer() Win32Timer::Win32Timer()
......
...@@ -4,20 +4,23 @@ ...@@ -4,20 +4,23 @@
// found in the LICENSE file. // found in the LICENSE file.
// //
#ifndef SAMPLE_UTIL_WIN32_TIMER_H // Win32Timer.h: Definition of a high precision timer class on Windows
#define SAMPLE_UTIL_WIN32_TIMER_H
#ifndef UTIL_WIN32_TIMER_H
#define UTIL_WIN32_TIMER_H
#include "Timer.h"
#include <windows.h> #include <windows.h>
#include "Timer.h"
class Win32Timer : public Timer class Win32Timer : public Timer
{ {
public: public:
Win32Timer(); Win32Timer();
void start(); void start() override;
void stop(); void stop() override;
double getElapsedTime() const ; double getElapsedTime() const override;
private: private:
bool mRunning; bool mRunning;
...@@ -27,4 +30,4 @@ class Win32Timer : public Timer ...@@ -27,4 +30,4 @@ class Win32Timer : public Timer
LONGLONG mFrequency; LONGLONG mFrequency;
}; };
#endif // SAMPLE_UTIL_WIN32_TIMER_H #endif // UTIL_WIN32_TIMER_H
...@@ -4,6 +4,8 @@ ...@@ -4,6 +4,8 @@
// found in the LICENSE file. // found in the LICENSE file.
// //
// Win32Window.cpp: Implementation of OSWindow for Windows
#include "win32/Win32Window.h" #include "win32/Win32Window.h"
#include <sstream> #include <sstream>
......
...@@ -4,12 +4,15 @@ ...@@ -4,12 +4,15 @@
// found in the LICENSE file. // found in the LICENSE file.
// //
#ifndef SAMPLE_UTIL_WIN32_WINDOW_H // Win32Window.h: Definition of the implementation of OSWindow for Windows
#define SAMPLE_UTIL_WIN32_WINDOW_H
#ifndef UTIL_WIN32_WINDOW_H
#define UTIL_WIN32_WINDOW_H
#include "OSWindow.h"
#include <string>
#include <windows.h> #include <windows.h>
#include <string>
#include "OSWindow.h"
class Win32Window : public OSWindow class Win32Window : public OSWindow
{ {
...@@ -43,4 +46,4 @@ class Win32Window : public OSWindow ...@@ -43,4 +46,4 @@ class Win32Window : public OSWindow
EGLNativeDisplayType mNativeDisplay; EGLNativeDisplayType mNativeDisplay;
}; };
#endif // SAMPLE_UTIL_WIN32_WINDOW_H #endif // UTIL_WIN32_WINDOW_H
...@@ -4,6 +4,8 @@ ...@@ -4,6 +4,8 @@
// found in the LICENSE file. // found in the LICENSE file.
// //
// Win32_path_utils.cpp: Implementation of OS-specific path functions for Windows
#include "path_utils.h" #include "path_utils.h"
#include <array> #include <array>
#include <windows.h> #include <windows.h>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment