Skip to content

Commit 5426357

Browse files
committed
fix error committing
1 parent 371f179 commit 5426357

File tree

2 files changed

+21
-21
lines changed

2 files changed

+21
-21
lines changed

Frame/SDK/Core/AFGUID128.hpp

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/*
2-
* This source file is part of ArkGameFrame
3-
* For the latest info, see https://github.com/ArkGame
2+
* This source file is part of Ark
3+
* For the latest info, see https://github.com/QuadHex
44
*
5-
* Copyright (c) 2013-2018 ArkGame authors.
5+
* Copyright (c) 2013-2018 QuadHex authors.
66
*
77
* Licensed under the Apache License, Version 2.0 (the "License");
88
* you may not use this file except in compliance with the License.
@@ -25,19 +25,19 @@
2525
namespace ark
2626
{
2727

28-
class AFGUID
28+
class AFGUID128
2929
{
3030
public:
3131
uint64_t nHigh;
3232
uint64_t nLow;
3333

34-
AFGUID() = default;
34+
AFGUID128() = default;
3535

36-
AFGUID(uint64_t value) : nHigh(0), nLow(value)
36+
AFGUID128(uint64_t value) : nHigh(0), nLow(value)
3737
{
3838
}
3939

40-
AFGUID(uint64_t high, uint64_t low) : nHigh(high), nLow(low)
40+
AFGUID128(uint64_t high, uint64_t low) : nHigh(high), nLow(low)
4141
{
4242
}
4343

@@ -51,41 +51,41 @@ namespace ark
5151
return (0 == nHigh) && (0 == nLow);
5252
}
5353

54-
AFGUID& operator=(const int& rhs)
54+
AFGUID128& operator=(const int& rhs)
5555
{
5656
nHigh = 0;
5757
nLow = rhs;
5858
return *this;
5959
}
6060

61-
AFGUID& operator=(const int64_t& rhs)
61+
AFGUID128& operator=(const int64_t& rhs)
6262
{
6363
nHigh = 0;
6464
nLow = rhs;
6565
return *this;
6666
}
6767

68-
AFGUID& operator=(const AFGUID& rhs)
68+
AFGUID128& operator=(const AFGUID128& rhs)
6969
{
7070
if(this != &rhs)
7171
{
72-
this->nHigh = rhs.nHigh;
73-
this->nLow = rhs.nLow;
72+
nHigh = rhs.nHigh;
73+
nLow = rhs.nLow;
7474
}
7575
return *this;
7676
}
7777

78-
bool operator==(const AFGUID& rhs) const
78+
bool operator==(const AFGUID128& rhs) const
7979
{
8080
return (this->nHigh == rhs.nHigh) && (this->nLow == rhs.nLow);
8181
}
8282

83-
bool operator!=(const AFGUID& rhs) const
83+
bool operator!=(const AFGUID128& rhs) const
8484
{
8585
return !(*this == rhs);
8686
}
8787

88-
bool operator<(const AFGUID& rhs) const
88+
bool operator<(const AFGUID128& rhs) const
8989
{
9090
if (this->nHigh == rhs.nHigh)
9191
{

Frame/SDK/Core/AFVector3.hpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/*
2-
* This source file is part of ArkGameFrame
3-
* For the latest info, see https://github.com/ArkGame
2+
* This source file is part of ARK
3+
* For the latest info, see https://github.com/QuadHex
44
*
5-
* Copyright (c) 2013-2018 ArkGame authors.
5+
* Copyright (c) 2013-2018 QuadHex authors.
66
*
77
* Licensed under the Apache License, Version 2.0 (the "License");
88
* you may not use this file except in compliance with the License.
@@ -64,9 +64,9 @@ namespace ark
6464
{
6565
if(this != &rht)
6666
{
67-
this->x = rht.x;
68-
this->y = rht.y;
69-
this->z = rht.z;
67+
x = rht.x;
68+
y = rht.y;
69+
z = rht.z;
7070
}
7171
return *this;
7272
}

0 commit comments

Comments
 (0)