summaryrefslogtreecommitdiffstats
path: root/googletest/src
diff options
context:
space:
mode:
authorGennadiy Civil <misterg@google.com>2018-01-10 21:45:59 (GMT)
committerGennadiy Civil <misterg@google.com>2018-01-10 21:45:59 (GMT)
commit481fe9446a1dc83741a3d4143eedd40e3cb45858 (patch)
tree941b887e1df61f4590c34bdef0f29ca25a1841e2 /googletest/src
parent84aa45941fdf7b71e280152456f1268b0b961599 (diff)
downloadgoogletest-481fe9446a1dc83741a3d4143eedd40e3cb45858.zip
googletest-481fe9446a1dc83741a3d4143eedd40e3cb45858.tar.gz
googletest-481fe9446a1dc83741a3d4143eedd40e3cb45858.tar.bz2
More merge, cleanup
Diffstat (limited to 'googletest/src')
-rw-r--r--googletest/src/gtest-filepath.cc10
1 files changed, 4 insertions, 6 deletions
diff --git a/googletest/src/gtest-filepath.cc b/googletest/src/gtest-filepath.cc
index 0292dc1..a1fc0e3 100644
--- a/googletest/src/gtest-filepath.cc
+++ b/googletest/src/gtest-filepath.cc
@@ -26,14 +26,12 @@
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// Authors: keith.ray@gmail.com (Keith Ray)
-#include "gtest/gtest-message.h"
#include "gtest/internal/gtest-filepath.h"
-#include "gtest/internal/gtest-port.h"
#include <stdlib.h>
+#include "gtest/internal/gtest-port.h"
+#include "gtest/gtest-message.h"
#if GTEST_OS_WINDOWS_MOBILE
# include <windows.h>
@@ -48,6 +46,8 @@
# include <climits> // Some Linux distributions define PATH_MAX here.
#endif // GTEST_OS_WINDOWS_MOBILE
+#include "gtest/internal/gtest-string.h"
+
#if GTEST_OS_WINDOWS
# define GTEST_PATH_MAX_ _MAX_PATH
#elif defined(PATH_MAX)
@@ -58,8 +58,6 @@
# define GTEST_PATH_MAX_ _POSIX_PATH_MAX
#endif // GTEST_OS_WINDOWS
-#include "gtest/internal/gtest-string.h"
-
namespace testing {
namespace internal {