Skip to content

Commit

Permalink
fix error committing
Browse files Browse the repository at this point in the history
  • Loading branch information
nickyang4github committed Dec 27, 2018
1 parent 371f179 commit 5426357
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 21 deletions.
30 changes: 15 additions & 15 deletions Frame/SDK/Core/AFGUID128.hpp
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*
* This source file is part of ArkGameFrame
* For the latest info, see https://github.com/ArkGame
* This source file is part of Ark
* For the latest info, see https://github.com/QuadHex
*
* Copyright (c) 2013-2018 ArkGame authors.
* Copyright (c) 2013-2018 QuadHex authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -25,19 +25,19 @@
namespace ark
{

class AFGUID
class AFGUID128
{
public:
uint64_t nHigh;
uint64_t nLow;

AFGUID() = default;
AFGUID128() = default;

AFGUID(uint64_t value) : nHigh(0), nLow(value)
AFGUID128(uint64_t value) : nHigh(0), nLow(value)
{
}

AFGUID(uint64_t high, uint64_t low) : nHigh(high), nLow(low)
AFGUID128(uint64_t high, uint64_t low) : nHigh(high), nLow(low)
{
}

Expand All @@ -51,41 +51,41 @@ namespace ark
return (0 == nHigh) && (0 == nLow);
}

AFGUID& operator=(const int& rhs)
AFGUID128& operator=(const int& rhs)
{
nHigh = 0;
nLow = rhs;
return *this;
}

AFGUID& operator=(const int64_t& rhs)
AFGUID128& operator=(const int64_t& rhs)
{
nHigh = 0;
nLow = rhs;
return *this;
}

AFGUID& operator=(const AFGUID& rhs)
AFGUID128& operator=(const AFGUID128& rhs)
{
if(this != &rhs)
{
this->nHigh = rhs.nHigh;
this->nLow = rhs.nLow;
nHigh = rhs.nHigh;
nLow = rhs.nLow;
}
return *this;
}

bool operator==(const AFGUID& rhs) const
bool operator==(const AFGUID128& rhs) const
{
return (this->nHigh == rhs.nHigh) && (this->nLow == rhs.nLow);
}

bool operator!=(const AFGUID& rhs) const
bool operator!=(const AFGUID128& rhs) const
{
return !(*this == rhs);
}

bool operator<(const AFGUID& rhs) const
bool operator<(const AFGUID128& rhs) const
{
if (this->nHigh == rhs.nHigh)
{
Expand Down
12 changes: 6 additions & 6 deletions Frame/SDK/Core/AFVector3.hpp
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*
* This source file is part of ArkGameFrame
* For the latest info, see https://github.com/ArkGame
* This source file is part of ARK
* For the latest info, see https://github.com/QuadHex
*
* Copyright (c) 2013-2018 ArkGame authors.
* Copyright (c) 2013-2018 QuadHex authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -64,9 +64,9 @@ namespace ark
{
if(this != &rht)
{
this->x = rht.x;
this->y = rht.y;
this->z = rht.z;
x = rht.x;
y = rht.y;
z = rht.z;
}
return *this;
}
Expand Down

0 comments on commit 5426357

Please sign in to comment.