From 1152cdae9404446efbc89b1481c6213937722b88 Mon Sep 17 00:00:00 2001 From: Michael Hansen Date: Thu, 17 Jan 2013 17:50:58 -0800 Subject: [PATCH] Fix issues from review --- Sources/Plasma/CoreLib/plProduct.cpp | 10 +--------- Sources/Plasma/CoreLib/plProduct.h | 2 +- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/Sources/Plasma/CoreLib/plProduct.cpp b/Sources/Plasma/CoreLib/plProduct.cpp index 872de167..a939516b 100644 --- a/Sources/Plasma/CoreLib/plProduct.cpp +++ b/Sources/Plasma/CoreLib/plProduct.cpp @@ -49,15 +49,7 @@ static_assert(PRODUCT_BRANCH_ID > 0, "Branch ID cannot be zero"); uint32_t plProduct::BuildId() { return PRODUCT_BUILD_ID; } uint32_t plProduct::BuildType() { return PRODUCT_BUILD_TYPE; } - -uint32_t plProduct::BranchId() -{ -#ifndef PATCHER - return PRODUCT_BRANCH_ID; -#else - return 0; -#endif -} +uint32_t plProduct::BranchId() { return PRODUCT_BRANCH_ID; } plString plProduct::CoreName() { diff --git a/Sources/Plasma/CoreLib/plProduct.h b/Sources/Plasma/CoreLib/plProduct.h index 740170a8..16fc395c 100644 --- a/Sources/Plasma/CoreLib/plProduct.h +++ b/Sources/Plasma/CoreLib/plProduct.h @@ -40,7 +40,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include +#include class plString;