From a1df85d401d1a0a871311a5c3e3b3a7b2800c799 Mon Sep 17 00:00:00 2001
From: N2614 <N2614@385bec56-5757-e545-9c3a-d8741f4650f1>
Date: Wed, 18 Jan 2012 07:30:45 +0000
Subject: [PATCH] =?UTF-8?q?=E8=AD=A6=E5=91=8A=E5=AF=BE=E7=AD=96=20?=
 =?UTF-8?q?=E3=83=86=E3=82=B9=E3=83=88=E7=94=A8=E8=A8=AD=E5=AE=9A=E3=82=92?=
 =?UTF-8?q?test=5Fcommon.h=E3=81=AB=E3=81=BE=E3=81=A8=E3=82=81=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-05-23%20-%20ctr.7z%20+%20svn_v1.068.zip/ctr/svn/ctr_Repair@567 385bec56-5757-e545-9c3a-d8741f4650f1
---
 .../sources/ConsoleRestore/BgsCommunicator.cpp                | 3 +++
 .../sources/ConsoleRestore/BgsCommunicator.h                  | 3 +--
 .../sources/ConsoleRestore/RegionIdModifier.h                 | 4 +---
 .../sources/tests/googletest/BgsCommunicator/OMakefile        | 2 +-
 .../sources/tests/googletest/RegionIdModifier/OMakefile       | 4 +++-
 5 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/BgsCommunicator.cpp b/trunk/ConsoleDataMigration/sources/ConsoleRestore/BgsCommunicator.cpp
index 7188c05..e10c81f 100644
--- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/BgsCommunicator.cpp
+++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/BgsCommunicator.cpp
@@ -82,14 +82,17 @@ std::string BgsCommunicator::GetXml()
 
 bool BgsCommunicator::Execute()
 {
+    return false;
 }
 
 size_t BgsCommunicator::GetBodySize()
 {
+    return 0;
 }
 
 void BgsCommunicator::GetBody(void *buf)
 {
+    NN_UNUSED_VAR(buf);
 }
 
 } /* namespace ConsoleRestore */
diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/BgsCommunicator.h b/trunk/ConsoleDataMigration/sources/ConsoleRestore/BgsCommunicator.h
index 8372fe7..6b8c53e 100644
--- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/BgsCommunicator.h
+++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/BgsCommunicator.h
@@ -20,8 +20,7 @@
 #if     defined(__ARMCC_VERSION)
 #include <nn.h>
 #else
-#include <cstddef>
-#include "types.h"
+#include "test_common.h"
 #endif
 
 namespace ConsoleRestore
diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/RegionIdModifier.h b/trunk/ConsoleDataMigration/sources/ConsoleRestore/RegionIdModifier.h
index ca4522f..51a9179 100644
--- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/RegionIdModifier.h
+++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/RegionIdModifier.h
@@ -19,9 +19,7 @@
 #include <nn.h>
 #include <nn/cfg.h>
 #else
-#include <cstddef>
-#include "types.h"
-#include "stub.h"
+#include "test_common.h"
 #endif
 
 const size_t PATHLIST_LENGTH = 32;
diff --git a/trunk/ConsoleDataMigration/sources/tests/googletest/BgsCommunicator/OMakefile b/trunk/ConsoleDataMigration/sources/tests/googletest/BgsCommunicator/OMakefile
index eeff804..7416889 100644
--- a/trunk/ConsoleDataMigration/sources/tests/googletest/BgsCommunicator/OMakefile
+++ b/trunk/ConsoleDataMigration/sources/tests/googletest/BgsCommunicator/OMakefile
@@ -11,7 +11,7 @@ SRC_FILES[] =
 
 # テストディレクトリ外にあるので独自ルールでビルド
 BgsCommunicator$(EXT_OBJ): ../../../ConsoleRestore/BgsCommunicator.cpp
-    $(CXX) $(PREFIXED_INCLUDES) -c $<
+    $(CXX) $(CXXFLAGS) $(PREFIXED_INCLUDES) -c $<
 
 .DEFAULT: BgsCommunicator$(EXT_OBJ) $(TARGET)$(EXE)
 
diff --git a/trunk/ConsoleDataMigration/sources/tests/googletest/RegionIdModifier/OMakefile b/trunk/ConsoleDataMigration/sources/tests/googletest/RegionIdModifier/OMakefile
index 511d761..42de733 100644
--- a/trunk/ConsoleDataMigration/sources/tests/googletest/RegionIdModifier/OMakefile
+++ b/trunk/ConsoleDataMigration/sources/tests/googletest/RegionIdModifier/OMakefile
@@ -10,9 +10,11 @@ SRC_FILES[] =
                testUtil
                RegionIdModifier
 
+CXXFLAGS += -DPCTEST_USE_STUB
+
 # テストディレクトリ外にあるので独自ルールでビルド
 RegionIdModifier$(EXT_OBJ): ../../../ConsoleRestore/RegionIdModifier.cpp
-    $(CXX) $(PREFIXED_INCLUDES) -c $<
+    $(CXX) $(CXXFLAGS) $(PREFIXED_INCLUDES) -c $<
 
 .DEFAULT: RegionIdModifier$(EXT_OBJ) $(TARGET)$(EXE)